LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: LinkProperties: Unique Route Destinations

Browse Source 
Routes will always have unique destinations. Update tests
to use unique destinations when adding multiple routes.

Test: treehugger
Change-Id: I238899b0643407a1be29eb66d28728ca5d5dbc80
This commit is contained in:
Tyler Wear
2020-02-13 17:14:38 -08:00
parent 543ecddcdc
commit 44999a7247
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/net/common/java/android/net/LinkPropertiesTest.java
View File

@@ -315,7 +315,7 @@ public class LinkPropertiesTest {
source.addDnsServer(DNS1); source.addDnsServer(DNS1);
source.addDnsServer(DNS2); source.addDnsServer(DNS2);
// set 2 gateways // set 2 gateways
source.addRoute(new RouteInfo(GATEWAY1)); source.addRoute(new RouteInfo(LINKADDRV4, GATEWAY1));
source.addRoute(new RouteInfo(GATEWAY2)); source.addRoute(new RouteInfo(GATEWAY2));
source.setMtu(MTU); source.setMtu(MTU);
@@ -327,7 +327,7 @@ public class LinkPropertiesTest {
target.addDnsServer(DNS2); target.addDnsServer(DNS2);
target.addDnsServer(DNS1); target.addDnsServer(DNS1);
target.addRoute(new RouteInfo(GATEWAY2)); target.addRoute(new RouteInfo(GATEWAY2));
target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(LINKADDRV4, GATEWAY1));
target.setMtu(MTU); target.setMtu(MTU);
assertLinkPropertiesEqual(source, target); assertLinkPropertiesEqual(source, target);
@@ -364,12 +364,13 @@ public class LinkPropertiesTest {
@Test @Test
public void testRouteInterfaces() { public void testRouteInterfaces() {
LinkAddress prefix = new LinkAddress(address("2001:db8::"), 32); LinkAddress prefix1 = new LinkAddress(address("2001:db8:1::"), 48);
LinkAddress prefix2 = new LinkAddress(address("2001:db8:2::"), 48);
InetAddress address = ADDRV6; InetAddress address = ADDRV6;
// Add a route with no interface to a LinkProperties with no interface. No errors. // Add a route with no interface to a LinkProperties with no interface. No errors.
LinkProperties lp = new LinkProperties(); LinkProperties lp = new LinkProperties();
RouteInfo r = new RouteInfo(prefix, address, null); RouteInfo r = new RouteInfo(prefix1, address, null);
assertTrue(lp.addRoute(r)); assertTrue(lp.addRoute(r));
assertEquals(1, lp.getRoutes().size()); assertEquals(1, lp.getRoutes().size());
assertAllRoutesHaveInterface(null, lp); assertAllRoutesHaveInterface(null, lp);
@@ -379,7 +380,7 @@ public class LinkPropertiesTest {
assertEquals(1, lp.getRoutes().size()); assertEquals(1, lp.getRoutes().size());
// Add a route with an interface. Expect an exception. // Add a route with an interface. Expect an exception.
r = new RouteInfo(prefix, address, "wlan0"); r = new RouteInfo(prefix2, address, "wlan0");
try { try {
lp.addRoute(r); lp.addRoute(r);
fail("Adding wlan0 route to LP with no interface, expect exception"); fail("Adding wlan0 route to LP with no interface, expect exception");
@@ -398,7 +399,7 @@ public class LinkPropertiesTest {
} catch (IllegalArgumentException expected) {} } catch (IllegalArgumentException expected) {}
// If the interface name matches, the route is added. // If the interface name matches, the route is added.
r = new RouteInfo(prefix, null, "wlan0"); r = new RouteInfo(prefix2, null, "wlan0");
lp.setInterfaceName("wlan0"); lp.setInterfaceName("wlan0");
lp.addRoute(r); lp.addRoute(r);
assertEquals(2, lp.getRoutes().size()); assertEquals(2, lp.getRoutes().size());
@@ -423,10 +424,12 @@ public class LinkPropertiesTest {
assertEquals(3, lp.compareAllRoutes(lp2).added.size()); assertEquals(3, lp.compareAllRoutes(lp2).added.size());
assertEquals(3, lp.compareAllRoutes(lp2).removed.size()); assertEquals(3, lp.compareAllRoutes(lp2).removed.size());
// Check remove works // Remove route with incorrect interface, no route removed.
lp.removeRoute(new RouteInfo(prefix, address, null)); lp.removeRoute(new RouteInfo(prefix2, null, null));
assertEquals(3, lp.getRoutes().size()); assertEquals(3, lp.getRoutes().size());
lp.removeRoute(new RouteInfo(prefix, address, "wlan0"));
// Check remove works when interface is correct.
lp.removeRoute(new RouteInfo(prefix2, null, "wlan0"));
assertEquals(2, lp.getRoutes().size()); assertEquals(2, lp.getRoutes().size());
assertAllRoutesHaveInterface("wlan0", lp); assertAllRoutesHaveInterface("wlan0", lp);
assertAllRoutesNotHaveInterface("p2p0", lp); assertAllRoutesNotHaveInterface("p2p0", lp);