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

Unbreak LinkPropertiesTest.

Browse Source 
This was broken by the changes that made addRoute add routes
only if they did not already exist.

Change-Id: I1d227df9223fbecf106efde05b709f320824ee9d
This commit is contained in:
Lorenzo Colitti
2014-06-23 21:16:34 +09:00
parent 52228dd7cf
commit 3897f1a407
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/android/net/LinkPropertiesTest.java
View File

@@ -245,11 +245,15 @@ public class LinkPropertiesTest extends TestCase {
// 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(prefix, address, null);
lp.addRoute(r); assertTrue(lp.addRoute(r));
assertEquals(1, lp.getRoutes().size()); assertEquals(1, lp.getRoutes().size());
assertAllRoutesHaveInterface(null, lp); assertAllRoutesHaveInterface(null, lp);
// Add a route with an interface. Except an exception. // Adding the same route twice has no effect.
assertFalse(lp.addRoute(r));
assertEquals(1, lp.getRoutes().size());
// Add a route with an interface. Expect an exception.
r = new RouteInfo(prefix, address, "wlan0"); r = new RouteInfo(prefix, address, "wlan0");
try { try {
lp.addRoute(r); lp.addRoute(r);
@@ -267,6 +271,7 @@ public class LinkPropertiesTest extends TestCase {
} 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");
lp.setInterfaceName("wlan0"); lp.setInterfaceName("wlan0");
lp.addRoute(r); lp.addRoute(r);
assertEquals(2, lp.getRoutes().size()); assertEquals(2, lp.getRoutes().size());