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

Commit e0312485 authored by Hall Liu's avatar Hall Liu
Browse files

Change tests to match fixes to PackageChangeReceiver 

Change the test files to match the new usage of
Context#registerReceiver.

Test: atest FrameworksTelephonyTests
Bug: 146834818
Change-Id: Ib955664cc90b69d4ddacc755361af567505df68f
parent 29a1bba8

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

+12 −4
Original line number Diff line number Diff line
@@ -321,25 +321,28 @@ public class ContextFixture implements TestFixture<Context> { 


        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {

            return registerReceiver(receiver, filter, null, null);

            return registerReceiverFakeImpl(receiver, filter);

        }



        @Override

        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

                String broadcastPermission, Handler scheduler) {

            return registerReceiverAsUser(receiver, null, filter, broadcastPermission, scheduler);

            return registerReceiverFakeImpl(receiver, filter);

        }



        @Override

        public Intent registerReceiverForAllUsers(BroadcastReceiver receiver,

                IntentFilter filter, String broadcastPermission, Handler scheduler) {

            return registerReceiverAsUser(

                    receiver, UserHandle.ALL, filter, broadcastPermission, scheduler);

            return registerReceiverFakeImpl(receiver, filter);

        }



        @Override

        public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

                IntentFilter filter, String broadcastPermission, Handler scheduler) {

            return registerReceiverFakeImpl(receiver, filter);

        }



        private Intent registerReceiverFakeImpl(BroadcastReceiver receiver, IntentFilter filter) {

            Intent result = null;

            synchronized (mBroadcastReceiversByAction) {

                for (int i = 0 ; i < filter.countActions() ; i++) {
@@ -422,6 +425,11 @@ public class ContextFixture implements TestFixture<Context> { 
            sendBroadcast(intent);

        }



        @Override

        public Context createContextAsUser(UserHandle user, int flags) {

            return this;

        }



        @Override

        public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,

                String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler,

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static org.mockito.Matchers.anyLong; 
import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -43,7 +42,6 @@ import android.database.Cursor; 
import android.net.Uri;

import android.os.AsyncResult;

import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;
@@ -810,7 +808,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
        // implementation in ContextFixture. registerReceiver may be called more than once (for

        // example by GsmInboundSmsHandler if TEST_MODE is true)

        verify(mContext, atLeastOnce()).registerReceiver(any(BroadcastReceiver.class),

                any(IntentFilter.class), eq((String) null), eq((Handler) null));

                any(IntentFilter.class));



        // wait for ScanRawTableThread

        waitForMs(100);