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

Commit 46a78740 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Test that DhcpClient sets the server address in LinkProperties. 

This test should only run on R and above because the DHCP server
was added to LinkProperties in R.

Bug: 134098566
Test: test-only change
Change-Id: Ic99c913f34ecfaca0645c56478d7de75eb176da1
parent 5c11021f

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

+15 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ import com.android.networkstack.arp.ArpPacket; 
import com.android.server.NetworkObserverRegistry;

import com.android.server.NetworkStackService.NetworkStackServiceManager;

import com.android.server.connectivity.ipmemorystore.IpMemoryStoreService;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.TapPacketReader;
@@ -658,6 +659,12 @@ public class IpClientIntegrationTest { 
                null /* captivePortalApiUrl */, null /* displayName */, null /* scanResultInfo */);

    }



    private List<DhcpPacket> performDhcpHandshake() throws Exception {

        return performDhcpHandshake(true /* isSuccessLease */, TEST_LEASE_DURATION_S,

                false /* isDhcpLeaseCacheEnabled */, false /* shouldReplyRapidCommitAck */,

                TEST_DEFAULT_MTU, false /* isDhcpIpConflictDetectEnabled */);

    }



    private DhcpPacket getNextDhcpPacket() throws ParseException {

        byte[] packet;

        while ((packet = mPacketReader.popPacket(PACKET_TIMEOUT_MS)) != null) {
@@ -1051,6 +1058,14 @@ public class IpClientIntegrationTest { 
        assertTrue(packet instanceof DhcpDiscoverPacket);

    }



    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)

    public void testDhcpServerInLinkProperties() throws Exception {

        performDhcpHandshake();

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

        verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningSuccess(captor.capture());

        assertEquals(SERVER_ADDR, captor.getValue().getDhcpServerAddress());

    }



    @Test

    public void testRestoreInitialInterfaceMtu() throws Exception {

        doRestoreInitialMtuTest(true /* shouldChangeMtu */, false /* shouldRemoveTapInterface */);