Eliminate RouteDistinguisherBuilder

[bgpcep.git] / bgp / concepts / src / test / java / org / opendaylight / bgp / concepts / RouteDistinguisherUtilTest.java

diff --git a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java
index 47f7eeef524cca399772703977373934ed868690..ad05cb3a72c2069dd5e468b1797c3f6ae6b93bb7 100644 (file)
--- a/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java
+++ b/bgp/concepts/src/test/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtilTest.java
@@ -9,16 +9,17 @@ package org.opendaylight.bgp.concepts;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.opendaylight.bgp.concepts.RouteDistinguisherUtil.SEPARATOR;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RdAs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RdIpv4;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RdTwoOctetAs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteDistinguisher;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteDistinguisherBuilder;
 
 public class RouteDistinguisherUtilTest {
-
     private static final String IP_ADDRESS = "1.2.3.4";
     private static final String IP_PORT = "10";
     private static final String ADMIN = "55";
@@ -30,89 +31,61 @@ public class RouteDistinguisherUtilTest {
     private static final byte[] AS_4B_BYTES = {0, 2, 0, 0, 0, 55, (byte) 0xff, (byte) 0xff};
     private static final byte[] INVALID_RD_TYPE_BYTES = {0, 3, 0, 0, 0, 55, (byte) 0xff, (byte) 0xff};
 
-    /**
-     * Create 4-octet AS RD or IPv4 RD, 2-octet AS RD cannot be created with this function.
-     */
-    private static RouteDistinguisher createRouteDistinguisher(final int type, final String administratorSubfield,
-            final String assignedNumberSubfield) {
-        final StringBuilder routeDistiguisher = new StringBuilder();
-        if (type == 0) {
-            routeDistiguisher.append(type).append(SEPARATOR);
-        }
-        routeDistiguisher.append(administratorSubfield);
-        routeDistiguisher.append(SEPARATOR);
-        routeDistiguisher.append(assignedNumberSubfield);
-        return RouteDistinguisherBuilder.getDefaultInstance(routeDistiguisher.toString());
-    }
-
     @Test
     public void testAs2BRouteDistinguisher() {
-        final RouteDistinguisher expected = createRouteDistinguisher(0, ADMIN, ASSIGNED_NUMBER);
-        final RouteDistinguisher parsed = RouteDistinguisherUtil
-            .parseRouteDistinguisher(Unpooled.copiedBuffer(AS_2B_BYTES));
-        assertEquals(expected.getRdTwoOctetAs(), parsed.getRdTwoOctetAs());
-        final ByteBuf byteAggregator = Unpooled.buffer(AS_2B_BYTES.length);
-        RouteDistinguisherUtil.serializeRouteDistinquisher(expected, byteAggregator);
+        final var expected = new RouteDistinguisher(
+            new RdTwoOctetAs("0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER));
+        assertEquals(expected,
+            RouteDistinguisherUtil.parseRouteDistinguisher("0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER));
+
+        final var parsed = RouteDistinguisherUtil.parseRouteDistinguisher(Unpooled.copiedBuffer(AS_2B_BYTES));
+        assertEquals(expected, parsed);
+        final var byteAggregator = Unpooled.buffer(AS_2B_BYTES.length);
+        RouteDistinguisherUtil.serializeRouteDistinquisher(parsed, byteAggregator);
         assertArrayEquals(AS_2B_BYTES, byteAggregator.array());
-        assertEquals("0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER,
-                parsed.getRdTwoOctetAs().getValue());
     }
 
     @Test
     public void testAs2BLongRouteDistinguisher() {
-        final RouteDistinguisher expected = createRouteDistinguisher(0, ADMIN, ASSIGNED_NUMBER_BIG);
-        final RouteDistinguisher parsed = RouteDistinguisherUtil
-            .parseRouteDistinguisher(Unpooled.copiedBuffer(AS_2B_BYTES_BIG));
-        assertEquals(expected.getRdTwoOctetAs(), parsed.getRdTwoOctetAs());
-        final ByteBuf byteAggregator = Unpooled.buffer(AS_2B_BYTES_BIG.length);
-        RouteDistinguisherUtil.serializeRouteDistinquisher(expected, byteAggregator);
+        final var expected = new RouteDistinguisher(new RdTwoOctetAs(
+            "0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER_BIG));
+        assertEquals(expected,
+            RouteDistinguisherUtil.parseRouteDistinguisher("0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER_BIG));
+
+        final var parsed = RouteDistinguisherUtil.parseRouteDistinguisher(Unpooled.copiedBuffer(AS_2B_BYTES_BIG));
+        assertEquals(expected, parsed);
+        final var byteAggregator = Unpooled.buffer(AS_2B_BYTES_BIG.length);
+        RouteDistinguisherUtil.serializeRouteDistinquisher(parsed, byteAggregator);
         assertArrayEquals(AS_2B_BYTES_BIG, byteAggregator.array());
-        assertEquals("0" + SEPARATOR + ADMIN + SEPARATOR + ASSIGNED_NUMBER_BIG,
-                parsed.getRdTwoOctetAs().getValue());
     }
 
     @Test
     public void testIpv4RouteDistinguisher() {
-        final RouteDistinguisher expected = createRouteDistinguisher(1, IP_ADDRESS, IP_PORT);
-        final RouteDistinguisher parsed = RouteDistinguisherUtil
-            .parseRouteDistinguisher(Unpooled.copiedBuffer(IP_BYTES));
-        assertEquals(expected.getRdIpv4(), parsed.getRdIpv4());
-        final ByteBuf byteAggregator = Unpooled.buffer(IP_BYTES.length);
-        RouteDistinguisherUtil.serializeRouteDistinquisher(expected, byteAggregator);
+        final var expected = new RouteDistinguisher(new RdIpv4(IP_ADDRESS + SEPARATOR + IP_PORT));
+        assertEquals(expected, RouteDistinguisherUtil.parseRouteDistinguisher(IP_ADDRESS + SEPARATOR + IP_PORT));
+
+        final var parsed = RouteDistinguisherUtil.parseRouteDistinguisher(Unpooled.copiedBuffer(IP_BYTES));
+        assertEquals(expected, parsed);
+        final var byteAggregator = Unpooled.buffer(IP_BYTES.length);
+        RouteDistinguisherUtil.serializeRouteDistinquisher(parsed, byteAggregator);
         assertArrayEquals(IP_BYTES, byteAggregator.array());
-        assertEquals(IP_ADDRESS + SEPARATOR + IP_PORT, parsed.getRdIpv4().getValue());
     }
 
     @Test
     public void testAs4BRouteDistinguisher() {
-        final RouteDistinguisher expected = createRouteDistinguisher(2, ADMIN, ASSIGNED_NUMBER);
-        final RouteDistinguisher parsed = RouteDistinguisherUtil
-            .parseRouteDistinguisher(Unpooled.copiedBuffer(AS_4B_BYTES));
-        assertEquals(expected.getRdAs(), parsed.getRdAs());
-        final ByteBuf byteAggregator = Unpooled.buffer(AS_4B_BYTES.length);
-        RouteDistinguisherUtil.serializeRouteDistinquisher(expected, byteAggregator);
+        final var expected = new RouteDistinguisher(new RdAs(ADMIN + SEPARATOR + ASSIGNED_NUMBER));
+        assertEquals(expected, RouteDistinguisherUtil.parseRouteDistinguisher(ADMIN + SEPARATOR + ASSIGNED_NUMBER));
+
+        final var parsed = RouteDistinguisherUtil.parseRouteDistinguisher(Unpooled.copiedBuffer(AS_4B_BYTES));
+        assertEquals(expected, parsed);
+        final var byteAggregator = Unpooled.buffer(AS_4B_BYTES.length);
+        RouteDistinguisherUtil.serializeRouteDistinquisher(parsed, byteAggregator);
         assertArrayEquals(AS_4B_BYTES, byteAggregator.array());
-        assertEquals(ADMIN + SEPARATOR + ASSIGNED_NUMBER, parsed.getRdAs().getValue());
     }
 
     @Test
-    public void testParseRouteDistinguisher() {
-        final RouteDistinguisher expected = RouteDistinguisherUtil
-            .parseRouteDistinguisher(ADMIN + SEPARATOR + ASSIGNED_NUMBER);
-        final RouteDistinguisher parsed = RouteDistinguisherUtil
-            .parseRouteDistinguisher(Unpooled.copiedBuffer(AS_4B_BYTES));
-        assertEquals(expected.getRdAs(), parsed.getRdAs());
-
-        final RouteDistinguisher expectedRD = RouteDistinguisherUtil.parseRouteDistinguisher(expected);
-        assertEquals(expectedRD.getRdAs(), parsed.getRdAs());
-
-        final RouteDistinguisher expectedObj = RouteDistinguisherUtil
-            .parseRouteDistinguisher((Object) (ADMIN + SEPARATOR + ASSIGNED_NUMBER));
-        assertEquals(expectedObj.getRdAs(), parsed.getRdAs());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
     public void testInvalidRDType() {
-        RouteDistinguisherUtil.parseRouteDistinguisher(Unpooled.copiedBuffer(INVALID_RD_TYPE_BYTES));
+        final var buf = Unpooled.copiedBuffer(INVALID_RD_TYPE_BYTES);
+        assertThrows(IllegalArgumentException.class, () -> RouteDistinguisherUtil.parseRouteDistinguisher(buf));
     }
 }