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

Commit 936f6ba5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Change tests to match fixes to PackageChangeReceiver am: 0604c377 am: 5ea0bbd5 

Change-Id: Ifb6b7f7312daefd8fccaf214e20a61ca94e66860
parents d1a611c3 5ea0bbd5

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

+8 −5
Original line number Diff line number Diff line
@@ -315,18 +315,16 @@ 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 registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

                IntentFilter filter, String broadcastPermission, Handler scheduler) {

        private Intent registerReceiverFakeImpl(BroadcastReceiver receiver, IntentFilter filter) {

            Intent result = null;

            synchronized (mBroadcastReceiversByAction) {

                for (int i = 0 ; i < filter.countActions() ; i++) {
@@ -409,6 +407,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

+2 −4
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;
@@ -809,8 +807,8 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
        // verify that a broadcast receiver is registered for current user (user == null) based on

        // implementation in ContextFixture. registerReceiver may be called more than once (for

        // example by GsmInboundSmsHandler if TEST_MODE is true)

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

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

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

                any(IntentFilter.class));



        // wait for ScanRawTableThread

        waitForMs(100);