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

Commit e639bf3b authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge "Rename utils to remove the Kt suffix"

parents 10d27abf 23a06306

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

+10 −10
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ import com.android.server.connectivity.ipmemorystore.IpMemoryStoreService; 
import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.HandlerUtils;

import com.android.testutils.TapPacketReader;



import org.junit.After;
@@ -464,7 +464,7 @@ public class IpClientIntegrationTest { 
        // that mock IpClient's dependencies might interact with those mocks while IpClient is

        // starting. This would cause UnfinishedStubbingExceptions as mocks cannot be interacted

        // with while they are being stubbed.

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);



        // Tell the IpMemoryStore immediately to answer any question about network attributes with a

        // null response. Otherwise, the DHCP client will wait for two seconds before starting,
@@ -874,7 +874,7 @@ public class IpClientIntegrationTest { 
            }



            mIpc.notifyPreconnectionComplete(false /* abort */);

            HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

            HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);



            if (shouldFirePreconnectionTimeout && !timeoutBeforePreconnectionComplete) {

                mDependencies.mDhcpClient.sendMessage(DhcpClient.CMD_TIMEOUT);
@@ -907,7 +907,7 @@ public class IpClientIntegrationTest { 


        if (!shouldAbortPreconnection) {

            mIpc.notifyPreconnectionComplete(true /* success */);

            HandlerUtilsKt.waitForIdle(mDependencies.mDhcpClient.getHandler(), TEST_TIMEOUT_MS);

            HandlerUtils.waitForIdle(mDependencies.mDhcpClient.getHandler(), TEST_TIMEOUT_MS);



            // If timeout fires after successful preconnection, right now DhcpClient will have

            // already entered BOUND state, the delayed CMD_TIMEOUT command would be ignored. So
@@ -1620,14 +1620,14 @@ public class IpClientIntegrationTest { 


        // Check that the alarm is cancelled when IpClient is stopped.

        mIpc.stop();

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        expectAlarmCancelled(inOrder, clearAlarm);

        expectNat64PrefixUpdate(inOrder, null);



        // Check that even if the alarm was already in the message queue while it was cancelled, it

        // is safely ignored.

        mIpc.getHandler().post(() -> clearAlarm.onAlarm());

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    private void addIpAddressAndWaitForIt(final String iface) throws Exception {
@@ -1662,7 +1662,7 @@ public class IpClientIntegrationTest { 
        }



        // Wait for IpClient to process the addition of the address.

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    private void doIPv4OnlyProvisioningAndExitWithLeftAddress() throws Exception {
@@ -1726,7 +1726,7 @@ public class IpClientIntegrationTest { 


        // Force to enter RunningState.

        mIpc.notifyPreconnectionComplete(false /* abort */);

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test
@@ -1834,7 +1834,7 @@ public class IpClientIntegrationTest { 


        // Force IpClient transition to RunningState from PreconnectionState.

        mIpc.notifyPreconnectionComplete(false /* success */);

        HandlerUtilsKt.waitForIdle(mDependencies.mDhcpClient.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mDependencies.mDhcpClient.getHandler(), TEST_TIMEOUT_MS);

        verify(mCb, timeout(TEST_TIMEOUT_MS)).setFallbackMulticastFilter(false);

    }
@@ -2148,7 +2148,7 @@ public class IpClientIntegrationTest { 
        mPacketReader.sendResponse(buildDhcpAckPacket(packet,

                hasMismatchedIpAddress ? CLIENT_ADDR_NEW : CLIENT_ADDR, TEST_LEASE_DURATION_S,

                (short) TEST_DEFAULT_MTU, false /* rapidcommit */, null /* captivePortalUrl */));

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

        if (hasMismatchedIpAddress) {

            // notifyFailure

            ArgumentCaptor<DhcpResultsParcelable> captor =

tests/unit/src/android/net/dhcp/DhcpResultsParcelableUtilTest.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static android.net.InetAddresses.parseNumericAddress; 
import static android.net.dhcp.DhcpResultsParcelableUtil.fromStableParcelable;

import static android.net.dhcp.DhcpResultsParcelableUtil.toStableParcelable;



import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;

import static com.android.testutils.MiscAsserts.assertFieldCountEquals;



import static org.junit.Assert.assertEquals;

tests/unit/src/android/net/dhcp/DhcpServerTest.java

+13 −13
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import android.testing.AndroidTestingRunner; 
import androidx.test.filters.SmallTest;



import com.android.net.module.util.Inet4AddressUtils;

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.HandlerUtils;



import org.junit.After;

import org.junit.Before;
@@ -187,7 +187,7 @@ public class DhcpServerTest { 


    private void startServer() throws Exception {

        mServer.start(mAssertSuccessCallback);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

    }



    @Before
@@ -225,7 +225,7 @@ public class DhcpServerTest { 
    @Test

    public void testStartWithCallbacks() throws Exception {

        mServer.start(mAssertSuccessCallback, mEventCallbacks);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        verify(mRepository).addLeaseCallbacks(eq(mEventCallbacks));

    }
@@ -242,7 +242,7 @@ public class DhcpServerTest { 
                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,

                false /* broadcast */, INADDR_ANY /* srcIp */, false /* rapidCommit */);

        mServer.sendMessage(CMD_RECEIVE_PACKET, discover);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        assertResponseSentTo(TEST_CLIENT_ADDR);

        final DhcpOfferPacket packet = assertOffer(getPacket());
@@ -261,7 +261,7 @@ public class DhcpServerTest { 
                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,

                false /* broadcast */, INADDR_ANY /* srcIp */, true /* rapidCommit */);

        mServer.sendMessage(CMD_RECEIVE_PACKET, discover);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        assertResponseSentTo(TEST_CLIENT_ADDR);

        final DhcpAckPacket packet = assertAck(getPacket());
@@ -280,7 +280,7 @@ public class DhcpServerTest { 
                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,

                false /* broadcast */, INADDR_ANY /* srcIp */, false /* rapidCommit */);

        mServer.sendMessage(CMD_RECEIVE_PACKET, discover);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        assertResponseSentTo(INADDR_BROADCAST);

        final DhcpNakPacket packet = assertNak(getPacket());
@@ -309,7 +309,7 @@ public class DhcpServerTest { 
        request.mHostName = TEST_HOSTNAME;

        request.mRequestedParams = new byte[] { DHCP_HOST_NAME };

        mServer.sendMessage(CMD_RECEIVE_PACKET, request);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        assertResponseSentTo(TEST_CLIENT_ADDR);

        final DhcpAckPacket packet = assertAck(getPacket());
@@ -327,7 +327,7 @@ public class DhcpServerTest { 


        final DhcpRequestPacket request = makeRequestSelectingPacket();

        mServer.sendMessage(CMD_RECEIVE_PACKET, request);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        assertResponseSentTo(INADDR_BROADCAST);

        final DhcpNakPacket packet = assertNak(getPacket());
@@ -342,7 +342,7 @@ public class DhcpServerTest { 
                TEST_SERVER_ADDR, TEST_CLIENT_ADDR,

                INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES);

        mServer.sendMessage(CMD_RECEIVE_PACKET, release);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        verify(mRepository, times(1))

                .releaseLease(isNull(), eq(TEST_CLIENT_MAC), eq(TEST_CLIENT_ADDR));
@@ -368,7 +368,7 @@ public class DhcpServerTest { 
                INADDR_ANY /* nextIp */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,

                TEST_CLIENT_ADDR /* requestedIp */, TEST_SERVER_ADDR /* serverIdentifier */);

        mServer.sendMessage(CMD_RECEIVE_PACKET, decline);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);



        verify(mRepository).markAndReleaseDeclinedLease(isNull(), eq(TEST_CLIENT_MAC),

                eq(TEST_CLIENT_ADDR));
@@ -393,7 +393,7 @@ public class DhcpServerTest { 
        params.changePrefixOnDecline = changePrefixOnDecline;



        mServer.updateParams(params, mAssertSuccessCallback);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test
@@ -402,7 +402,7 @@ public class DhcpServerTest { 
                eq(TEST_CLIENT_ADDR))).thenReturn(true);



        mServer.start(mAssertSuccessCallback, mEventCallbacks);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        verify(mRepository).addLeaseCallbacks(eq(mEventCallbacks));



        // Enable changePrefixOnDecline
@@ -436,7 +436,7 @@ public class DhcpServerTest { 
                (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES,

                false /* broadcast */, INADDR_ANY /* srcIp */, false /* rapidCommit */);

        mServer.sendMessage(CMD_RECEIVE_PACKET, discover);

        HandlerUtilsKt.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(mServer.getHandler(), TEST_TIMEOUT_MS);

        assertResponseSentTo(clientAddr);

        final DhcpOfferPacket packet = assertOffer(getPacket());

        assertMatchesLease(packet, serverAddr, clientAddr, null);

tests/unit/src/android/net/dhcp/DhcpServingParamsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import androidx.test.filters.SmallTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.net.module.util.Inet4AddressUtils;

import com.android.testutils.MiscAssertsKt;

import com.android.testutils.MiscAsserts;



import org.junit.Before;

import org.junit.Test;
@@ -199,7 +199,7 @@ public class DhcpServingParamsTest { 
        assertEquals(params.singleClientAddr, parceled.singleClientAddr);

        assertEquals(params.changePrefixOnDecline, parceled.changePrefixOnDecline);



        MiscAssertsKt.assertFieldCountEquals(10, DhcpServingParamsParcel.class);

        MiscAsserts.assertFieldCountEquals(10, DhcpServingParamsParcel.class);

    }



    @Test(expected = InvalidParameterException.class)

tests/unit/src/android/net/ip/IpClientTest.java

+5 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import com.android.server.NetworkObserver; 
import com.android.server.NetworkObserverRegistry;

import com.android.server.NetworkStackService;

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

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.HandlerUtils;



import org.junit.Before;

import org.junit.Test;
@@ -262,7 +262,7 @@ public class IpClientTest { 
                lp.getDnsServers().stream().map(InetAddress::getHostAddress)

                        .toArray(String[]::new));



        HandlerUtilsKt.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        verify(mCb, never()).onProvisioningFailure(any());

        verify(mIpMemoryStore, never()).storeNetworkAttributes(any(), any(), any());
@@ -301,7 +301,7 @@ public class IpClientTest { 


        reset(mCb);

        doIPv6ProvisioningLoss(lp);

        HandlerUtilsKt.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        verify(mCb).onProvisioningFailure(lp);

        verify(mCb).onLinkPropertiesChange(makeEmptyLinkProperties(TEST_IFNAME));
@@ -326,11 +326,11 @@ public class IpClientTest { 
        final IpClient ipc = doProvisioningWithDefaultConfiguration();

        final LinkProperties lp = makeIPv6ProvisionedLinkProperties();

        addIPv4Provisioning(lp);

        HandlerUtilsKt.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);



        reset(mCb);

        doIPv6ProvisioningLoss(lp);

        HandlerUtilsKt.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        HandlerUtils.waitForIdle(ipc.getHandler(), TEST_TIMEOUT_MS);

        if (avoidBadWifi) { // Provisioning failure is expected only when avoidBadWifi is true

            verify(mCb).onProvisioningFailure(lp);

            verify(mCb).onLinkPropertiesChange(makeEmptyLinkProperties(TEST_IFNAME));