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

Commit e191d8d9 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge "Make MockVpn more realistic and easier to use."

parents cbd6dbc5 62b5f28a

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ class ConnectivityServiceIntegrationTest { 
        nsInstrumentation.addHttpResponse(HttpResponse(httpProbeUrl, responseCode = 204))

        nsInstrumentation.addHttpResponse(HttpResponse(httpsProbeUrl, responseCode = 204))



        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, LinkProperties(), context)

        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, LinkProperties(), null /* ncTemplate */,

                context)

        networkStackClient.verifyNetworkMonitorCreated(na.network, TEST_TIMEOUT_MS)



        na.addCapability(NET_CAPABILITY_INTERNET)
@@ -238,7 +239,7 @@ class ConnectivityServiceIntegrationTest { 


        val lp = LinkProperties()

        lp.captivePortalApiUrl = Uri.parse(apiUrl)

        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, lp, context)

        val na = NetworkAgentWrapper(TRANSPORT_CELLULAR, lp, null /* ncTemplate */, context)

        networkStackClient.verifyNetworkMonitorCreated(na.network, TEST_TIMEOUT_MS)



        na.addCapability(NET_CAPABILITY_INTERNET)

tests/net/integration/util/com/android/server/NetworkAgentWrapper.java

+3 −3
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
    private long mKeepaliveResponseDelay = 0L;

    private Integer mExpectedKeepaliveSlot = null;



    public NetworkAgentWrapper(int transport, LinkProperties linkProperties, Context context)

            throws Exception {

    public NetworkAgentWrapper(int transport, LinkProperties linkProperties,

            NetworkCapabilities ncTemplate, Context context) throws Exception {

        final int type = transportToLegacyType(transport);

        final String typeName = ConnectivityManager.getNetworkTypeName(type);

        mNetworkInfo = new NetworkInfo(type, 0, typeName, "Mock");

        mNetworkCapabilities = new NetworkCapabilities();

        mNetworkCapabilities = (ncTemplate != null) ? ncTemplate : new NetworkCapabilities();

        mNetworkCapabilities.addCapability(NET_CAPABILITY_NOT_SUSPENDED);

        mNetworkCapabilities.addTransportType(transport);

        switch (transport) {

tests/net/java/com/android/server/ConnectivityServiceTest.java

+214 −286

File changed.

Preview size limit exceeded, changes collapsed.