From 3897f1a407daebcd2cb9e52a6dc9b2aabacc67ce Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Mon, 23 Jun 2014 21:16:34 +0900 Subject: [PATCH] Unbreak LinkPropertiesTest. This was broken by the changes that made addRoute add routes only if they did not already exist. Change-Id: I1d227df9223fbecf106efde05b709f320824ee9d --- .../coretests/src/android/net/LinkPropertiesTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/tests/coretests/src/android/net/LinkPropertiesTest.java b/core/tests/coretests/src/android/net/LinkPropertiesTest.java index e649baa070..9646510ba8 100644 --- a/core/tests/coretests/src/android/net/LinkPropertiesTest.java +++ b/core/tests/coretests/src/android/net/LinkPropertiesTest.java @@ -245,11 +245,15 @@ public class LinkPropertiesTest extends TestCase { // Add a route with no interface to a LinkProperties with no interface. No errors. LinkProperties lp = new LinkProperties(); RouteInfo r = new RouteInfo(prefix, address, null); - lp.addRoute(r); + assertTrue(lp.addRoute(r)); assertEquals(1, lp.getRoutes().size()); 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"); try { lp.addRoute(r); @@ -267,6 +271,7 @@ public class LinkPropertiesTest extends TestCase { } catch (IllegalArgumentException expected) {} // If the interface name matches, the route is added. + r = new RouteInfo(prefix, null, "wlan0"); lp.setInterfaceName("wlan0"); lp.addRoute(r); assertEquals(2, lp.getRoutes().size());