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

Commit 91114249 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Address comments on aosp/1448415" am: 1a41c294 am: bafa5751 am:... 

Merge "Address comments on aosp/1448415" am: 1a41c294 am: bafa5751 am: 2920fb27 am: 94040f7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465505

Change-Id: If14a6913d9d721f0fa680afe0ee51e089fddb749
parents 73a91998 94040f7d

tests/net/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ android_test { 
    platform_apis: true,

    test_suites: ["device-tests"],

    certificate: "platform",

    jarjar_rules: "jarjar-rules.txt",

    static_libs: [

        "androidx.test.rules",

        "FrameworksNetCommonTests",

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

+0 −30
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import org.junit.runner.RunWith; 
import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;
@@ -952,28 +951,6 @@ public class LinkPropertiesTest { 
        assertTrue(rmnet3.getAllRoutes().isEmpty());

        rmnet3.ensureDirectlyConnectedRoutes();

        assertEqualRoutes(Collections.singletonList(directRoute3), rmnet3.getAllRoutes());



    }



    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testCompareResult() {

        // Either adding or removing items

        compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1),

                Arrays.asList(2, 3, 4), new ArrayList<>());

        compareResult(Arrays.asList(1, 2), Arrays.asList(3, 2, 1, 4),

                new ArrayList<>(), Arrays.asList(3, 4));





        // adding and removing items at the same time

        compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(2, 3, 4, 5),

                Arrays.asList(1), Arrays.asList(5));

        compareResult(Arrays.asList(1, 2, 3), Arrays.asList(4, 5, 6),

                Arrays.asList(1, 2, 3), Arrays.asList(4, 5, 6));



        // null cases

        compareResult(Arrays.asList(1, 2, 3), null, Arrays.asList(1, 2, 3), new ArrayList<>());

        compareResult(null, Arrays.asList(3, 2, 1), new ArrayList<>(), Arrays.asList(1, 2, 3));

        compareResult(null, null, new ArrayList<>(), new ArrayList<>());

    }



    private void assertEqualRoutes(Collection<RouteInfo> expected, Collection<RouteInfo> actual) {
@@ -985,13 +962,6 @@ public class LinkPropertiesTest { 
        assertEquals(expectedSet, actualSet);

    }



    private <T> void compareResult(List<T> oldItems, List<T> newItems, List<T> expectRemoved,

            List<T> expectAdded) {

        CompareResult<T> result = new CompareResult<>(oldItems, newItems);

        assertEquals(new ArraySet<>(expectAdded), new ArraySet<>(result.added));

        assertEquals(new ArraySet<>(expectRemoved), (new ArraySet<>(result.removed)));

    }



    private static LinkProperties makeLinkPropertiesForParceling() {

        LinkProperties source = new LinkProperties();

        source.setInterfaceName(NAME);

tests/net/jarjar-rules.txt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Module library in frameworks/libs/net

rule com.android.net.module.util.** android.net.frameworktests.util.@1