ISIS protocol manual merge from 1.6 due to cherry pick merge conflict
Change-Id: I6c3abf6a83ddaeba76293dc7864fcec88e9b4e7e
diff --git a/protocols/isis/isisio/src/test/java/org/onosproject/isis/io/isispacket/tlv/subtlv/InterfaceIpAddressTest.java b/protocols/isis/isisio/src/test/java/org/onosproject/isis/io/isispacket/tlv/subtlv/InterfaceIpAddressTest.java
index 5acb728..5019fe1 100644
--- a/protocols/isis/isisio/src/test/java/org/onosproject/isis/io/isispacket/tlv/subtlv/InterfaceIpAddressTest.java
+++ b/protocols/isis/isisio/src/test/java/org/onosproject/isis/io/isispacket/tlv/subtlv/InterfaceIpAddressTest.java
@@ -33,7 +33,7 @@
public class InterfaceIpAddressTest {
private final byte[] packet = {1, 1, 1, 1};
private final byte[] packet1 = {};
- private InterfaceIpAddress interfaceIpAddress;
+ private NeighborIpAddress interfaceIpAddress;
private TlvHeader tlvHeader;
private Ip4Address ip4Address = Ip4Address.valueOf("1.1.1.1");
private byte[] result;
@@ -41,7 +41,7 @@
@Before
public void setUp() throws Exception {
- interfaceIpAddress = new InterfaceIpAddress(new TlvHeader());
+ interfaceIpAddress = new NeighborIpAddress(new TlvHeader());
}
@After
@@ -61,15 +61,6 @@
}
/**
- * Tests addLocalInterfaceIPAddress() method.
- */
- @Test
- public void testAddLocalInterfaceIPAddress() throws Exception {
- interfaceIpAddress.addLocalInterfaceIPAddress(ip4Address);
- assertThat(interfaceIpAddress, is(notNullValue()));
- }
-
- /**
* Tests readFrom() method.
*/
@Test
@@ -77,7 +68,7 @@
tlvHeader = new TlvHeader();
tlvHeader.setTlvType(3);
tlvHeader.setTlvLength(4);
- interfaceIpAddress = new InterfaceIpAddress(tlvHeader);
+ interfaceIpAddress = new NeighborIpAddress(tlvHeader);
channelBuffer = ChannelBuffers.copiedBuffer(packet);
interfaceIpAddress.readFrom(channelBuffer);
assertThat(interfaceIpAddress, is(notNullValue()));
@@ -91,27 +82,11 @@
tlvHeader = new TlvHeader();
tlvHeader.setTlvType(3);
tlvHeader.setTlvLength(4);
- interfaceIpAddress = new InterfaceIpAddress(tlvHeader);
+ interfaceIpAddress = new NeighborIpAddress(tlvHeader);
channelBuffer = ChannelBuffers.copiedBuffer(packet1);
interfaceIpAddress.readFrom(channelBuffer);
assertThat(interfaceIpAddress, is(notNullValue()));
}
- /**
- * Tests asBytes() method.
- */
- @Test
- public void testAsBytes() throws Exception {
- result = interfaceIpAddress.asBytes();
- assertThat(result, is(notNullValue()));
- }
- /**
- * Tests getLinkSubTypeTlvBodyAsByteArray() method.
- */
- @Test
- public void testGetLinkSubTypeTlvBodyAsByteArray() throws Exception {
- result = interfaceIpAddress.tlvBodyAsBytes();
- assertThat(result, is(notNullValue()));
- }
}
\ No newline at end of file