Code clean up for LISP address and control message test cases
- Statically import builder classes to improve code readability
- Instantiate builder object in one line
Change-Id: I5439c5b2b160e19591234dff598e537f1c64b355
diff --git a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
index c3d74e4..8375a8d 100644
--- a/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
+++ b/protocols/lisp/msg/src/test/java/org/onosproject/lisp/msg/types/LispSourceDestLcafAddressTest.java
@@ -24,6 +24,7 @@
import org.onosproject.lisp.msg.exceptions.LispParseError;
import org.onosproject.lisp.msg.exceptions.LispReaderException;
import org.onosproject.lisp.msg.exceptions.LispWriterException;
+import org.onosproject.lisp.msg.types.LispSourceDestLcafAddress.SourceDestAddressBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -42,8 +43,7 @@
@Before
public void setup() {
- LispSourceDestLcafAddress.SourceDestAddressBuilder builder1 =
- new LispSourceDestLcafAddress.SourceDestAddressBuilder();
+ SourceDestAddressBuilder builder1 = new SourceDestAddressBuilder();
LispIpv4Address srcAddress1 = new LispIpv4Address(IpAddress.valueOf("192.168.1.1"));
LispIpv4Address dstAddress1 = new LispIpv4Address(IpAddress.valueOf("192.168.1.2"));
@@ -56,8 +56,7 @@
.withDstPrefix(dstAddress1)
.build();
- LispSourceDestLcafAddress.SourceDestAddressBuilder builder2 =
- new LispSourceDestLcafAddress.SourceDestAddressBuilder();
+ SourceDestAddressBuilder builder2 = new SourceDestAddressBuilder();
sameAsAddress1 = builder2
.withReserved((short) 1)
@@ -67,8 +66,7 @@
.withDstPrefix(dstAddress1)
.build();
- LispSourceDestLcafAddress.SourceDestAddressBuilder builder3 =
- new LispSourceDestLcafAddress.SourceDestAddressBuilder();
+ SourceDestAddressBuilder builder3 = new SourceDestAddressBuilder();
LispIpv4Address srcAddress2 = new LispIpv4Address(IpAddress.valueOf("192.168.2.1"));
LispIpv4Address dstAddress2 = new LispIpv4Address(IpAddress.valueOf("192.168.2.2"));