Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e0dabf authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Make LinkPropertiesTest compatible with Q" am: 512c1497 

Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
parents 02fb8acf 512c1497

tests/net/common/java/android/net/LinkPropertiesTest.java

+11 −5
Original line number Diff line number Diff line
@@ -445,14 +445,20 @@ public class LinkPropertiesTest { 
        // Check comparisons work.

        LinkProperties lp2 = new LinkProperties(lp);

        assertAllRoutesHaveInterface("wlan0", lp2);

        // 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);

        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),