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

Commit ff5b8c8f authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Create TestableLooper in ImsTestBase" into sc-dev am: e19471e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15031722

Change-Id: Iaa40b6a55867e74cd9bd68b303870492c4060c44
parents b04928c6 e19471e5

tests/telephonytests/src/com/android/internal/telephony/ims/ImsResolverTest.java

+26 −27
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ public class ImsResolverTest extends ImsTestBase { 
    public void tearDown() throws Exception {

        mTestImsResolver.destroy();

        mTestImsResolver = null;

        mLooper.destroy();

        mLooper = null;

        super.tearDown();

    }
@@ -646,7 +644,7 @@ public class ImsResolverTest extends ImsTestBase { 
        setConfigCarrierStringMmTelRcs(0, null);

        startBindCarrierConfigAlreadySet();



        mLooper.processAllMessages();

        processAllMessages();

        verify(mMockQueryManager, never()).startQuery(any(), any());

        verify(controller, never()).bind(any());

        verify(controller, never()).unbind();
@@ -673,7 +671,7 @@ public class ImsResolverTest extends ImsTestBase { 




        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        // There is no carrier override set, so make sure that the ImsServiceController binds

        // to all SIMs.
@@ -706,7 +704,7 @@ public class ImsResolverTest extends ImsTestBase { 




        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        // There is no carrier override set, so make sure that the ImsServiceController binds

        // to all SIMs.
@@ -720,7 +718,7 @@ public class ImsResolverTest extends ImsTestBase { 
        // Change number of SIMs and verify the features in the ImsServiceController are changed

        // as well

        PhoneConfigurationManager.notifyMultiSimConfigChange(1);

        mLooper.processAllMessages();

        processAllMessages();

        featureSet = convertToHashSet(features, 0);

        verify(controller).changeImsServiceFeatures(featureSet);

        verify(controller, never()).unbind();
@@ -748,7 +746,7 @@ public class ImsResolverTest extends ImsTestBase { 




        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        // There is no carrier override set, so make sure that the ImsServiceController binds

        // to all SIMs.
@@ -807,7 +805,7 @@ public class ImsResolverTest extends ImsTestBase { 
                convertToFeatureSlotPairs(0, ImsResolver.METADATA_RCS_FEATURE);



        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();

        // ensure that startQuery was called

        verify(mMockQueryManager, times(1)).startQuery(eq(TEST_DEVICE_DEFAULT_NAME),

                any(String.class));
@@ -817,7 +815,7 @@ public class ImsResolverTest extends ImsTestBase { 


        mDynamicQueryListener.onComplete(TEST_DEVICE_DEFAULT_NAME, deviceFeatures1);

        mDynamicQueryListener.onComplete(TEST_DEVICE2_DEFAULT_NAME, deviceFeatures2);

        mLooper.processAllMessages();

        processAllMessages();



        verify(deviceController, times(2)).bind(eq(deviceFeatures1));

        verify(deviceController2, times(1)).bind(eq(deviceFeatures2));
@@ -935,7 +933,7 @@ public class ImsResolverTest extends ImsTestBase { 
        // Move to single SIM and verify the features in the ImsServiceController are changed as

        // well.

        PhoneConfigurationManager.notifyMultiSimConfigChange(1);

        mLooper.processAllMessages();

        processAllMessages();

        carrierFeatures = new HashSet<>();

        carrierFeatures.add(new ImsFeatureConfiguration.FeatureSlotPair(0, ImsFeature.FEATURE_RCS));

        verify(carrierController).changeImsServiceFeatures(carrierFeatures);
@@ -966,7 +964,7 @@ public class ImsResolverTest extends ImsTestBase { 




        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        // There is no carrier override set, so make sure that the ImsServiceController binds

        // to all SIMs.
@@ -1583,7 +1581,7 @@ public class ImsResolverTest extends ImsTestBase { 
        info.add(getResolveInfo(TEST_CARRIER_DEFAULT_NAME, new HashSet<>(), true));

        // Boot complete has happened and the carrier ImsService is now available.

        mTestBootCompleteReceiver.onReceive(null, new Intent(Intent.ACTION_BOOT_COMPLETED));

        mLooper.processAllMessages();

        processAllMessages();

        setupDynamicQueryFeatures(TEST_CARRIER_DEFAULT_NAME, carrierFeatures, 1);



        // Verify that all features that have been defined for the carrier override are bound
@@ -1680,7 +1678,7 @@ public class ImsResolverTest extends ImsTestBase { 
        assertEquals(TEST_DEVICE_DEFAULT_NAME, deviceController.getComponentName());



        mTestImsResolver.imsServiceBindPermanentError(TEST_CARRIER_DEFAULT_NAME);

        mLooper.processAllMessages();

        processAllMessages();

        verify(carrierController).unbind();

        // Verify that the device ImsService features are changed to include the ones previously

        // taken by the carrier app.
@@ -1711,7 +1709,7 @@ public class ImsResolverTest extends ImsTestBase { 
        setImsServiceControllerFactory(deviceController1, deviceController2, null, null);



        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        Set<String> featureResult = new HashSet<>();

        featureResult.add(ImsResolver.METADATA_MMTEL_FEATURE);
@@ -1748,7 +1746,7 @@ public class ImsResolverTest extends ImsTestBase { 
        setImsServiceControllerFactory(deviceController1, deviceController2, null, null);



        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        Set<String> featureResult = new HashSet<>();

        featureResult.add(ImsResolver.METADATA_RCS_FEATURE);
@@ -1789,7 +1787,7 @@ public class ImsResolverTest extends ImsTestBase { 
        setImsServiceControllerFactory(deviceController1, deviceController2, null, null);



        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        HashSet<ImsFeatureConfiguration.FeatureSlotPair> featureSet1 =

                convertToHashSet(features1, 0);
@@ -1830,7 +1828,7 @@ public class ImsResolverTest extends ImsTestBase { 
        setImsServiceControllerFactory(deviceController1, deviceController2, null, null);



        startBindNoCarrierConfig(1);

        mLooper.processAllMessages();

        processAllMessages();



        verify(deviceController1, never()).bind(any());

        verify(deviceController1, never()).unbind();
@@ -1868,6 +1866,7 @@ public class ImsResolverTest extends ImsTestBase { 
                numSlots, mMockRepo);

        try {

            mLooper = new TestableLooper(mTestImsResolver.getHandler().getLooper());

            monitorTestableLooper(mLooper);

        } catch (Exception e) {

            fail("Unable to create looper from handler.");

        }
@@ -1877,7 +1876,7 @@ public class ImsResolverTest extends ImsTestBase { 
        when(mMockQueryManagerFactory.create(any(Context.class),

                any(ImsServiceFeatureQueryManager.Listener.class))).thenReturn(mMockQueryManager);

        mTestImsResolver.setImsDynamicQueryManagerFactory(mMockQueryManagerFactory);

        mLooper.processAllMessages();

        processAllMessages();

    }



    private void setupPackageQuery(List<ResolveInfo> infos) {
@@ -1935,7 +1934,7 @@ public class ImsResolverTest extends ImsTestBase { 
        mDynamicQueryListener = queryManagerCaptor.getValue();

        when(mMockQueryManager.startQuery(any(ComponentName.class), any(String.class)))

                .thenReturn(true);

        mLooper.processAllMessages();

        processAllMessages();

    }



    /**
@@ -1954,7 +1953,7 @@ public class ImsResolverTest extends ImsTestBase { 
                ArgumentCaptor.forClass(ImsServiceFeatureQueryManager.Listener.class);

        verify(mMockQueryManagerFactory).create(any(Context.class), queryManagerCaptor.capture());

        mDynamicQueryListener = queryManagerCaptor.getValue();

        mLooper.processAllMessages();

        processAllMessages();

        // For ease of testing, slotId = subId

        for (int i = 0; i < numSlots; i++) {

            sendCarrierConfigChanged(i, i);
@@ -1963,19 +1962,19 @@ public class ImsResolverTest extends ImsTestBase { 


    private void setupDynamicQueryFeatures(ComponentName name,

            HashSet<ImsFeatureConfiguration.FeatureSlotPair> features, int times) {

        mLooper.processAllMessages();

        processAllMessages();

        // ensure that startQuery was called

        verify(mMockQueryManager, times(times)).startQuery(eq(name), any(String.class));

        mDynamicQueryListener.onComplete(name, features);

        mLooper.processAllMessages();

        processAllMessages();

    }



    private void setupDynamicQueryFeaturesFailure(ComponentName name, int times) {

        mLooper.processAllMessages();

        processAllMessages();

        // ensure that startQuery was called

        verify(mMockQueryManager, times(times)).startQuery(eq(name), any(String.class));

        mDynamicQueryListener.onPermanentError(name);

        mLooper.processAllMessages();

        processAllMessages();

    }



    public void packageChanged(String packageName) {
@@ -1985,7 +1984,7 @@ public class ImsResolverTest extends ImsTestBase { 
        addPackageIntent.setData(new Uri.Builder().scheme("package").opaquePart(packageName)

                .build());

        mTestPackageBroadcastReceiver.onReceive(null, addPackageIntent);

        mLooper.processAllMessages();

        processAllMessages();

    }



    public void packageRemoved(String packageName) {
@@ -1994,7 +1993,7 @@ public class ImsResolverTest extends ImsTestBase { 
        removePackageIntent.setData(new Uri.Builder().scheme("package")

                .opaquePart(TEST_CARRIER_DEFAULT_NAME.getPackageName()).build());

        mTestPackageBroadcastReceiver.onReceive(null, removePackageIntent);

        mLooper.processAllMessages();

        processAllMessages();

    }



    private void setImsServiceControllerFactory(Map<String, ImsServiceController> controllerMap) {
@@ -2114,7 +2113,7 @@ public class ImsResolverTest extends ImsTestBase { 
        carrierConfigIntent.putExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        carrierConfigIntent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, slotId);

        mTestCarrierConfigReceiver.onReceive(null, carrierConfigIntent);

        mLooper.processAllMessages();

        processAllMessages();

    }



    private void setConfigCarrierStringMmTelRcs(int subId, String packageName) {

tests/telephonytests/src/com/android/internal/telephony/ims/ImsTestBase.java

+59 −0
Original line number Diff line number Diff line
@@ -16,14 +16,19 @@ 


package com.android.internal.telephony.ims;



import static org.junit.Assert.fail;



import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.testing.TestableLooper;



import androidx.test.InstrumentationRegistry;



import org.mockito.MockitoAnnotations;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;
@@ -33,6 +38,8 @@ import java.util.concurrent.TimeUnit; 
public class ImsTestBase {



    protected Context mContext;

    protected List<TestableLooper> mTestableLoopers = new ArrayList<>();

    protected TestableLooper mTestableLooper;



    public void setUp() throws Exception {

        mContext = InstrumentationRegistry.getTargetContext();
@@ -41,9 +48,16 @@ public class ImsTestBase { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        mTestableLooper = TestableLooper.get(ImsTestBase.this);

        monitorTestableLooper(mTestableLooper);

    }



    public void tearDown() throws Exception {

        unmonitorTestableLooper(mTestableLooper);

        for (TestableLooper looper : mTestableLoopers) {

            looper.destroy();

        }

        TestableLooper.remove(ImsTestBase.this);

    }



    protected final void waitForHandlerAction(Handler h, long timeoutMillis) {
@@ -61,4 +75,49 @@ public class ImsTestBase { 
            }

        }

    }



    /**

     * Add a TestableLooper to the list of monitored loopers

     * @param looper looper to be added if it doesn't already exist

     */

    public void monitorTestableLooper(TestableLooper looper) {

        if (looper != null && !mTestableLoopers.contains(looper)) {

            mTestableLoopers.add(looper);

        }

    }



    /**

     * Remove a TestableLooper from the list of monitored loopers

     * @param looper looper to be removed if it exists

     */

    public void unmonitorTestableLooper(TestableLooper looper) {

        if (looper != null && mTestableLoopers.contains(looper)) {

            mTestableLoopers.remove(looper);

        }

    }



    /**

     * Process all messages at the current time for all monitored TestableLoopers

     */

    public void processAllMessages() {

        if (mTestableLoopers.isEmpty()) {

            fail("mTestableLoopers is empty. Please make sure to add @RunWithLooper annotation");

        }

        while (!areAllTestableLoopersIdle()) {

            for (TestableLooper looper : mTestableLoopers) looper.processAllMessages();

        }

    }



    /**

     * Check if there are any messages to be processed in any monitored TestableLooper

     * Delayed messages to be handled at a later time will be ignored

     * @return true if there are no messages that can be handled at the current time

     *         across all monitored TestableLoopers

     */

    private boolean areAllTestableLoopersIdle() {

        for (TestableLooper looper : mTestableLoopers) {

            if (!looper.getLooper().getQueue().isIdle()) return false;

        }

        return true;

    }

}