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

Commit 0c182b25 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Wait for handlers to clear in SST test before continuing 

SST test was flaky because SST test handler was accessing mocks
while the test thread was modifying them (reproducable by lowering
waitForMs timeout locally).

Instead we will wait for the handler thread to clear by checking to
see if the thread has messages every 100 ms for up to 1 sec.

Bug: 140313454
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest
Change-Id: I1c6a1763520d4774d20113429eba44f26823f152
parent 23b5f9fd

tests/telephonytests/src/com/android/internal/telephony/CarrierServiceStateTrackerTest.java

+4 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.telephony;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.doReturn;
@@ -151,7 +149,7 @@ public class CarrierServiceStateTrackerTest extends TelephonyTest { 
        logd(LOG_TAG + ":testSendPrefNetworkNotification()");

        Intent intent = new Intent().setAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mContext.sendBroadcast(intent);

        waitForMs(300);

        waitForLastHandlerAction(mCarrierServiceStateTrackerTestHandler.getThreadHandler());



        Map<Integer, CarrierServiceStateTracker.NotificationType> notificationTypeMap =

                mCarrierSST.getNotificationTypeMap();
@@ -172,7 +170,7 @@ public class CarrierServiceStateTrackerTest extends TelephonyTest { 
                RILConstants.NETWORK_MODE_LTE_CDMA_EVDO);

        mSpyCarrierSST.getContentObserver().dispatchChange(false,

                Settings.Global.getUriFor(prefNetworkMode));

        waitForMs(500);

        waitForLastHandlerAction(mCarrierServiceStateTrackerTestHandler.getThreadHandler());

        verify(mNotificationManager, atLeast(1)).notify(

                eq(CarrierServiceStateTracker.PREF_NETWORK_NOTIFICATION_TAG),

                eq(SUB_ID), isA(Notification.class));
@@ -182,7 +180,7 @@ public class CarrierServiceStateTrackerTest extends TelephonyTest { 
                RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);

        mSpyCarrierSST.getContentObserver().dispatchChange(false,

                Settings.Global.getUriFor(prefNetworkMode));

        waitForMs(500);

        waitForLastHandlerAction(mCarrierServiceStateTrackerTestHandler.getThreadHandler());

        verify(mNotificationManager, atLeast(1)).cancel(

                CarrierServiceStateTracker.PREF_NETWORK_NOTIFICATION_TAG, SUB_ID);

    }
@@ -193,7 +191,7 @@ public class CarrierServiceStateTrackerTest extends TelephonyTest { 
        logd(LOG_TAG + ":testSendEmergencyNetworkNotification()");

        Intent intent = new Intent().setAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mContext.sendBroadcast(intent);

        waitForMs(300);

        waitForLastHandlerAction(mCarrierServiceStateTrackerTestHandler.getThreadHandler());



        Map<Integer, CarrierServiceStateTracker.NotificationType> notificationTypeMap =

                mCarrierSST.getNotificationTypeMap();

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+88 −90

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+27 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony;



import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Matchers.anyBoolean;
@@ -641,6 +642,32 @@ public abstract class TelephonyTest { 
        }

    }



    /**

     * Wait for up to 1 second for the handler message queue to clear.

     */

    protected final void waitForLastHandlerAction(Handler h) {

        CountDownLatch lock = new CountDownLatch(1);

        // Allow the handler to start work on stuff.

        h.postDelayed(lock::countDown, 100);

        int timeoutCount = 0;

        while (timeoutCount < 5) {

            try {

                if (lock.await(200, TimeUnit.MILLISECONDS)) {

                    // no messages in queue, stop waiting.

                    if (!h.hasMessagesOrCallbacks()) break;

                    lock = new CountDownLatch(1);

                    // Delay to allow the handler thread to start work on stuff.

                    h.postDelayed(lock::countDown, 100);

                }



            } catch (InterruptedException e) {

                // do nothing

            }

            timeoutCount++;

        }

        assertTrue("Handler was not empty before timeout elapsed", timeoutCount < 5);

    }



    protected final void waitForHandlerActionDelayed(Handler h, long timeoutMillis, long delayMs) {

        final CountDownLatch lock = new CountDownLatch(1);

        h.postDelayed(lock::countDown, delayMs);