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

Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d

Browse Source 
Change-Id: If22bcfadfc71bb8dd8be08740be202482ed23dd3
This commit is contained in:
Aaron Huang
2020-03-31 17:48:44 +00:00
committed by Automerger Merge Worker
parent 99e65a1d50 7dae24c85d
commit 678ea74867
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,14 +445,20 @@ public class LinkPropertiesTest {
// Check comparisons work.
LinkProperties lp2 = new LinkProperties(lp);
assertAllRoutesHaveInterface("wlan0", lp2);
assertEquals(0, lp.compareAllRoutes(lp2).added.size());
assertEquals(0, lp.compareAllRoutes(lp2).removed.size());
// LinkProperties#compareAllRoutes exists both in R and before R, but the return type
// changed in R, so a test compiled with the R version of LinkProperties cannot run on Q.
if (isAtLeastR()) {
assertEquals(0, lp.compareAllRoutes(lp2).added.size());
assertEquals(0, lp.compareAllRoutes(lp2).removed.size());
}
lp2.setInterfaceName("p2p0");
assertAllRoutesHaveInterface("p2p0", lp2);
assertAllRoutesNotHaveInterface("wlan0", lp2);
assertEquals(3, lp.compareAllRoutes(lp2).added.size());
assertEquals(3, lp.compareAllRoutes(lp2).removed.size());
if (isAtLeastR()) {
assertEquals(3, lp.compareAllRoutes(lp2).added.size());
assertEquals(3, lp.compareAllRoutes(lp2).removed.size());
}
// Remove route with incorrect interface, no route removed.
lp.removeRoute(new RouteInfo(prefix2, null, null));
@@ -946,7 +952,7 @@ public class LinkPropertiesTest {
}
@Test
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testCompareResult() {
// Either adding or removing items
compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1),