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

Make LinkPropertiesTest compatible with Q

Browse Source 
CompareResult had been moved from LinkProperties to LinkPropertiesUtils
so this change ignores testCompareResult() on Q and only check
compareAllRoutes() works while android version is at least R.

Bug: 151782584
Test: atest CtsNetTestCasesLatestSdk:LinkPropertiesTest
Merged-In: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
Change-Id: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
This commit is contained in:
Aaron Huang
2020-03-30 06:38:49 +00:00
committed by Remi NGUYEN VAN
parent f7d30445c7
commit ccd5ba288a
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. // Check comparisons work.
LinkProperties lp2 = new LinkProperties(lp); LinkProperties lp2 = new LinkProperties(lp);
assertAllRoutesHaveInterface("wlan0", lp2); assertAllRoutesHaveInterface("wlan0", lp2);
assertEquals(0, lp.compareAllRoutes(lp2).added.size()); // LinkProperties#compareAllRoutes exists both in R and before R, but the return type
assertEquals(0, lp.compareAllRoutes(lp2).removed.size()); // 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"); lp2.setInterfaceName("p2p0");
assertAllRoutesHaveInterface("p2p0", lp2); assertAllRoutesHaveInterface("p2p0", lp2);
assertAllRoutesNotHaveInterface("wlan0", lp2); assertAllRoutesNotHaveInterface("wlan0", lp2);
assertEquals(3, lp.compareAllRoutes(lp2).added.size()); if (isAtLeastR()) {
assertEquals(3, lp.compareAllRoutes(lp2).removed.size()); assertEquals(3, lp.compareAllRoutes(lp2).added.size());
assertEquals(3, lp.compareAllRoutes(lp2).removed.size());
}
// Remove route with incorrect interface, no route removed. // Remove route with incorrect interface, no route removed.
lp.removeRoute(new RouteInfo(prefix2, null, null)); lp.removeRoute(new RouteInfo(prefix2, null, null));
@@ -936,7 +942,7 @@ public class LinkPropertiesTest {
} }
@Test @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testCompareResult() { public void testCompareResult() {
// Either adding or removing items // Either adding or removing items
compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1), compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1),