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

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

Merge "Fix testDhcpClientCaptivePortalApiEnabled flakes" am: fd4ed24e am: 27091efd 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1415991

Change-Id: I4b5d21d31900568e619f2dcefd6ad4c0018dbfb3
parents fbee594b 27091efd

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+5 −3
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import static org.mockito.ArgumentMatchers.contains; 
import static org.mockito.ArgumentMatchers.longThat;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.argThat;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;
@@ -2014,15 +2015,16 @@ public class IpClientIntegrationTest { 


        final Uri expectedUrl = featureEnabled && serverSendsOption

                ? Uri.parse(TEST_CAPTIVE_PORTAL_URL) : null;

        // Wait for LinkProperties containing DHCP-obtained info, such as MTU

        // LinkProperties will be updated multiple times. Wait for it to contain DHCP-obtained info,

        // such as MTU.

        final ArgumentCaptor<LinkProperties> captor = ArgumentCaptor.forClass(LinkProperties.class);

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onLinkPropertiesChange(

        verify(mCb, timeout(TEST_TIMEOUT_MS).atLeastOnce()).onLinkPropertiesChange(

                argThat(lp -> lp.getMtu() == testMtu));



        // Ensure that the URL was set as expected in the callbacks.

        // Can't verify the URL up to Q as there is no such attribute in LinkProperties.

        if (!ShimUtils.isAtLeastR()) return;

        verify(mCb).onLinkPropertiesChange(captor.capture());

        verify(mCb, atLeastOnce()).onLinkPropertiesChange(captor.capture());

        assertTrue(captor.getAllValues().stream().anyMatch(

                lp -> Objects.equals(expectedUrl, lp.getCaptivePortalApiUrl())));

    }