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

Commit c02b3a38 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6529526 from 3f0922c1 to rvc-release 

Change-Id: I31aa653988d8c31d5dd9d5cc1a07efbd273efa89
parents 5fb020eb 3f0922c1

tests/lib/src/com/android/testutils/TestableNetworkCallback.kt

+11 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.testutils.RecorderCallback.CallbackEntry.Suspended 
import com.android.testutils.RecorderCallback.CallbackEntry.Unavailable

import kotlin.reflect.KClass

import kotlin.test.assertEquals

import kotlin.test.assertNotNull

import kotlin.test.assertTrue

import kotlin.test.fail
@@ -194,7 +195,16 @@ open class TestableNetworkCallback private constructor( 
        timeoutMs: Long = defaultTimeoutMs,

        from: Int = mark,

        crossinline predicate: (T) -> Boolean = { true }

    ) = history.poll(timeoutMs, from) { it is T && predicate(it) } as T

    ): T = eventuallyExpectOrNull(timeoutMs, from, predicate).also {

        assertNotNull(it, "Callback ${T::class} not received within ${timeoutMs}ms")

    } as T



    // TODO (b/157405399) straighten and unify the method names

    inline fun <reified T : CallbackEntry> eventuallyExpectOrNull(

        timeoutMs: Long = defaultTimeoutMs,

        from: Int = mark,

        crossinline predicate: (T) -> Boolean = { true }

    ) = history.poll(timeoutMs, from) { it is T && predicate(it) } as T?



    fun expectCallbackThat(

        timeoutMs: Long = defaultTimeoutMs,

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+17 −7
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ import static org.mockito.ArgumentMatchers.argThat; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.atMost;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;
@@ -1895,7 +1897,6 @@ public class NetworkMonitorTest { 
        setStatus(mHttpConnection, 500);

        setStatus(mFallbackConnection, 204);

        nm.forceReevaluation(Process.myUid());

        final ArgumentCaptor<Integer> intCaptor = ArgumentCaptor.forClass(Integer.class);

        // Expect to send HTTP, HTTPs, FALLBACK and evaluation results.

        verifyNetworkTested(NETWORK_VALIDATION_RESULT_PARTIAL,

                NETWORK_VALIDATION_PROBE_DNS | NETWORK_VALIDATION_PROBE_FALLBACK);
@@ -2085,8 +2086,11 @@ public class NetworkMonitorTest { 
        setPortal302(mOtherHttpConnection1);

        runPortalNetworkTest();

        // Get conclusive result from one of the HTTP probe. Expect to create 2 HTTP and 2 HTTPS

        // probes as resource configuration.

        verify(mCleartextDnsNetwork, times(4)).openConnection(any());

        // probes as resource configuration, but the portal can be detected before other probes

        // start.

        verify(mCleartextDnsNetwork, atMost(4)).openConnection(any());

        verify(mCleartextDnsNetwork, atLeastOnce()).openConnection(any());

        verify(mOtherHttpConnection1).getResponseCode();

    }



    @Test
@@ -2096,12 +2100,15 @@ public class NetworkMonitorTest { 
        setStatus(mOtherHttpsConnection2, 204);

        runValidatedNetworkTest();

        // Get conclusive result from one of the HTTPS probe. Expect to create 2 HTTP and 2 HTTPS

        // probes as resource configuration.

        verify(mCleartextDnsNetwork, times(4)).openConnection(any());

        // probes as resource configuration, but the network may validate from the HTTPS probe

        // before other probes start.

        verify(mCleartextDnsNetwork, atMost(4)).openConnection(any());

        verify(mCleartextDnsNetwork, atLeastOnce()).openConnection(any());

        verify(mOtherHttpsConnection2).getResponseCode();

    }



    @Test

    public void testMultipleProbesOnInValiadNetworkForPrioritizedResource() throws Exception {

    public void testMultipleProbesOnInValidNetworkForPrioritizedResource() throws Exception {

        setupResourceForMultipleProbes();

        // The configuration resource is prioritized. Only use configurations from resource.(i.e

        // Only configuration for mOtherHttpsConnection2, mOtherHttpsConnection2,
@@ -2110,8 +2117,11 @@ public class NetworkMonitorTest { 
        setStatus(mHttpsConnection, 204);

        runFailedNetworkTest();

        // No conclusive result from both HTTP and HTTPS probes. Expect to create 2 HTTP and 2 HTTPS

        // probes as resource configuration.

        // probes as resource configuration. All probes are expected to have been run because this

        // network is set to never validate (no probe has a success or portal result), so NM tests

        // all probes to completion.

        verify(mCleartextDnsNetwork, times(4)).openConnection(any());

        verify(mHttpsConnection, never()).getResponseCode();

    }



    @Test