Clean up use of NormalizedNodeBuilders

[bgpcep.git] / bgp / extensions / evpn / src / test / java / org / opendaylight / protocol / bgp / evpn / impl / esi / types / LanParserTest.java

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/LanParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/LanParserTest.java
index 2dd2ec060201cc879801301076d08993ac875c63..191467ca9ee086036a5d25aaab27cf1c0697025d 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/LanParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/LanParserTest.java
@@ -13,7 +13,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.MAC;
 import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.MAC_MODEL;
 import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.VALUE_SIZE;
 import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.createContBuilder;
-import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.createValueBuilder;
+import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.createValue;
 import static org.opendaylight.protocol.bgp.evpn.impl.esi.types.EsiModelUtil.BRIDGE_MAC_NID;
 import static org.opendaylight.protocol.bgp.evpn.impl.esi.types.EsiModelUtil.RBP_NID;
 
@@ -47,25 +47,25 @@ public class LanParserTest {
 
     @Before
     public void setUp() {
-        this.parser = new LanParser();
+        parser = new LanParser();
     }
 
     @Test
     public void parserTest() {
         final ByteBuf buff = Unpooled.buffer(VALUE_SIZE);
-        this.parser.serializeEsi(LAN_AUT_GEN_CASE, buff);
+        parser.serializeEsi(LAN_AUT_GEN_CASE, buff);
         assertArrayEquals(RESULT, ByteArray.getAllBytes(buff));
 
-        final Esi acResult = this.parser.parseEsi(Unpooled.wrappedBuffer(VALUE));
+        final Esi acResult = parser.parseEsi(Unpooled.wrappedBuffer(VALUE));
         assertEquals(LAN_AUT_GEN_CASE, acResult);
 
-        final Esi acmResult = this.parser.serializeEsi(createLanCont());
+        final Esi acmResult = parser.serializeEsi(createLanCont());
         assertEquals(LAN_AUT_GEN_CASE, acmResult);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void wrongCaseTest() {
-        this.parser.serializeEsi(new ArbitraryCaseBuilder().build(), null);
+        parser.serializeEsi(new ArbitraryCaseBuilder().build(), null);
     }
 
     public static ChoiceNode createLanChoice() {
@@ -77,7 +77,8 @@ public class LanParserTest {
 
     private static ContainerNode createLanCont() {
         return createContBuilder(new NodeIdentifier(LanAutoGenerated.QNAME))
-                .addChild(createValueBuilder(MAC_MODEL, BRIDGE_MAC_NID).build())
-                .addChild(createValueBuilder(PRIORITY, RBP_NID).build()).build();
+            .addChild(createValue(MAC_MODEL, BRIDGE_MAC_NID))
+            .addChild(createValue(PRIORITY, RBP_NID))
+            .build();
     }
 }
\ No newline at end of file