Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f

Change-Id: I02ba7c8eaeb9218815f12960c1514350b0b27399
This commit is contained in:
Lucas Lin
2020-03-30 03:42:28 +00:00
committed by Automerger Merge Worker

View File

@@ -480,6 +480,8 @@ public class LinkPropertiesTest {
assertEquals(1, rmnet0.getLinkAddresses().size()); assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(1, rmnet0.getAllAddresses().size()); assertEquals(1, rmnet0.getAllAddresses().size());
assertEquals(1, rmnet0.getAllLinkAddresses().size()); assertEquals(1, rmnet0.getAllLinkAddresses().size());
assertEquals(1, rmnet0.getAllInterfaceNames().size());
assertEquals("rmnet0", rmnet0.getAllInterfaceNames().get(0));
rmnet0.addStackedLink(clat4); rmnet0.addStackedLink(clat4);
assertEquals(1, rmnet0.getStackedLinks().size()); assertEquals(1, rmnet0.getStackedLinks().size());
@@ -487,6 +489,9 @@ public class LinkPropertiesTest {
assertEquals(1, rmnet0.getLinkAddresses().size()); assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(2, rmnet0.getAllAddresses().size()); assertEquals(2, rmnet0.getAllAddresses().size());
assertEquals(2, rmnet0.getAllLinkAddresses().size()); assertEquals(2, rmnet0.getAllLinkAddresses().size());
assertEquals(2, rmnet0.getAllInterfaceNames().size());
assertEquals("rmnet0", rmnet0.getAllInterfaceNames().get(0));
assertEquals("clat4", rmnet0.getAllInterfaceNames().get(1));
rmnet0.addStackedLink(clat4); rmnet0.addStackedLink(clat4);
assertEquals(1, rmnet0.getStackedLinks().size()); assertEquals(1, rmnet0.getStackedLinks().size());
@@ -494,6 +499,9 @@ public class LinkPropertiesTest {
assertEquals(1, rmnet0.getLinkAddresses().size()); assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(2, rmnet0.getAllAddresses().size()); assertEquals(2, rmnet0.getAllAddresses().size());
assertEquals(2, rmnet0.getAllLinkAddresses().size()); assertEquals(2, rmnet0.getAllLinkAddresses().size());
assertEquals(2, rmnet0.getAllInterfaceNames().size());
assertEquals("rmnet0", rmnet0.getAllInterfaceNames().get(0));
assertEquals("clat4", rmnet0.getAllInterfaceNames().get(1));
assertEquals(0, clat4.getStackedLinks().size()); assertEquals(0, clat4.getStackedLinks().size());
@@ -513,6 +521,8 @@ public class LinkPropertiesTest {
assertEquals(1, rmnet0.getLinkAddresses().size()); assertEquals(1, rmnet0.getLinkAddresses().size());
assertEquals(1, rmnet0.getAllAddresses().size()); assertEquals(1, rmnet0.getAllAddresses().size());
assertEquals(1, rmnet0.getAllLinkAddresses().size()); assertEquals(1, rmnet0.getAllLinkAddresses().size());
assertEquals(1, rmnet0.getAllInterfaceNames().size());
assertEquals("rmnet0", rmnet0.getAllInterfaceNames().get(0));
assertFalse(rmnet0.removeStackedLink("clat4")); assertFalse(rmnet0.removeStackedLink("clat4"));
} }
@@ -1197,4 +1207,48 @@ public class LinkPropertiesTest {
lp.clear(); lp.clear();
assertNull(lp.getCaptivePortalData()); assertNull(lp.getCaptivePortalData());
} }
private LinkProperties makeIpv4LinkProperties() {
final LinkProperties linkProperties = new LinkProperties();
linkProperties.setInterfaceName(NAME);
linkProperties.addLinkAddress(LINKADDRV4);
linkProperties.addDnsServer(DNS1);
linkProperties.addRoute(new RouteInfo(GATEWAY1));
linkProperties.addRoute(new RouteInfo(GATEWAY2));
return linkProperties;
}
private LinkProperties makeIpv6LinkProperties() {
final LinkProperties linkProperties = new LinkProperties();
linkProperties.setInterfaceName(NAME);
linkProperties.addLinkAddress(LINKADDRV6);
linkProperties.addDnsServer(DNS6);
linkProperties.addRoute(new RouteInfo(GATEWAY61));
linkProperties.addRoute(new RouteInfo(GATEWAY62));
return linkProperties;
}
@Test
public void testHasIpv4DefaultRoute() {
final LinkProperties Ipv4 = makeIpv4LinkProperties();
assertTrue(Ipv4.hasIpv4DefaultRoute());
final LinkProperties Ipv6 = makeIpv6LinkProperties();
assertFalse(Ipv6.hasIpv4DefaultRoute());
}
@Test
public void testHasIpv4DnsServer() {
final LinkProperties Ipv4 = makeIpv4LinkProperties();
assertTrue(Ipv4.hasIpv4DnsServer());
final LinkProperties Ipv6 = makeIpv6LinkProperties();
assertFalse(Ipv6.hasIpv4DnsServer());
}
@Test
public void testHasIpv6DnsServer() {
final LinkProperties Ipv4 = makeIpv4LinkProperties();
assertFalse(Ipv4.hasIpv6DnsServer());
final LinkProperties Ipv6 = makeIpv6LinkProperties();
assertTrue(Ipv6.hasIpv6DnsServer());
}
} }