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

Commit 51b16432 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b am: 12d74e1e 

Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
parents 40efc4cd 12d74e1e

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -875,6 +875,11 @@ public class NetworkCapabilitiesTest { 
        } catch (IllegalArgumentException e) { }

        } catch (IllegalArgumentException e) { }

    }

    }





    private class TestTransportInfo implements TransportInfo {

        TestTransportInfo() {

        }

    }



    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testBuilder() {

    public void testBuilder() {

        final int ownerUid = 1001;

        final int ownerUid = 1001;
@@ -882,6 +887,7 @@ public class NetworkCapabilitiesTest { 
        final int requestUid = 10100;

        final int requestUid = 10100;

        final int[] administratorUids = {ownerUid, 10001};

        final int[] administratorUids = {ownerUid, 10001};

        final TelephonyNetworkSpecifier specifier = new TelephonyNetworkSpecifier(1);

        final TelephonyNetworkSpecifier specifier = new TelephonyNetworkSpecifier(1);

        final TestTransportInfo transportInfo = new TestTransportInfo();

        final String ssid = "TEST_SSID";

        final String ssid = "TEST_SSID";

        final String packageName = "com.google.test.networkcapabilities";

        final String packageName = "com.google.test.networkcapabilities";

        final NetworkCapabilities nc = new NetworkCapabilities.Builder()

        final NetworkCapabilities nc = new NetworkCapabilities.Builder()
@@ -896,7 +902,7 @@ public class NetworkCapabilitiesTest { 
                .setLinkDownstreamBandwidthKbps(512)

                .setLinkDownstreamBandwidthKbps(512)

                .setLinkUpstreamBandwidthKbps(128)

                .setLinkUpstreamBandwidthKbps(128)

                .setNetworkSpecifier(specifier)

                .setNetworkSpecifier(specifier)

                .setTransportInfo(null)

                .setTransportInfo(transportInfo)

                .setSignalStrength(signalStrength)

                .setSignalStrength(signalStrength)

                .setSsid(ssid)

                .setSsid(ssid)

                .setRequestorUid(requestUid)

                .setRequestorUid(requestUid)
@@ -913,7 +919,7 @@ public class NetworkCapabilitiesTest { 
        assertEquals(128, nc.getLinkUpstreamBandwidthKbps());

        assertEquals(128, nc.getLinkUpstreamBandwidthKbps());

        assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps());

        assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps());

        assertEquals(specifier, nc.getNetworkSpecifier());

        assertEquals(specifier, nc.getNetworkSpecifier());

        assertNull(nc.getTransportInfo());

        assertEquals(transportInfo, nc.getTransportInfo());

        assertEquals(signalStrength, nc.getSignalStrength());

        assertEquals(signalStrength, nc.getSignalStrength());

        assertNotEquals(-50, nc.getSignalStrength());

        assertNotEquals(-50, nc.getSignalStrength());

        assertEquals(ssid, nc.getSsid());

        assertEquals(ssid, nc.getSsid());