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

Commit 47d22f53 authored by Kweku Adams's avatar Kweku Adams
Browse files

Fix JobScheduler tests. 

AppStandbyInternal was recently extracted but JobScheduler's tests
weren't updated. This updates them to use the new LocalService.

Bug: N/A
Test: atest com.android.server.job.JobSchedulerServiceTest
Test: atest com.android.server.job.JobStoreTest
Test: atest com.android.server.job.controllers.ConnectivityControllerTest
Test: atest com.android.server.job.controllers.JobStatusTest
Test: atest com.android.server.job.controllers.QuotaControllerTest
Test: atest com.android.server.job.controllers.StateControllerTest
Test: atest com.android.server.job.controllers.TimeControllerTes
Change-Id: Id65f7d1961c72b1343f578ee60854fb4cf988705
parent cefa9e3e

services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.server.AppStateTracker; 
import com.android.server.DeviceIdleInternal;

import com.android.server.LocalServices;

import com.android.server.job.controllers.JobStatus;

import com.android.server.usage.AppStandbyInternal;



import org.junit.After;

import org.junit.Before;
@@ -100,6 +101,8 @@ public class JobSchedulerServiceTest { 
        when(mContext.getMainLooper()).thenReturn(Looper.getMainLooper());

        doReturn(mActivityMangerInternal)

                .when(() -> LocalServices.getService(ActivityManagerInternal.class));

        doReturn(mock(AppStandbyInternal.class))

                .when(() -> LocalServices.getService(AppStandbyInternal.class));

        doReturn(mock(UsageStatsManagerInternal.class))

                .when(() -> LocalServices.getService(UsageStatsManagerInternal.class));

        // Called in BackgroundJobsController constructor.

services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import com.android.server.job.JobServiceContext; 
import com.android.server.job.JobStore;

import com.android.server.job.controllers.QuotaController.ExecutionStats;

import com.android.server.job.controllers.QuotaController.TimingSession;

import com.android.server.usage.AppStandbyInternal;



import org.junit.After;

import org.junit.Before;
@@ -150,6 +151,8 @@ public class QuotaControllerTest { 
        when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);

        doReturn(mActivityMangerInternal)

                .when(() -> LocalServices.getService(ActivityManagerInternal.class));

        doReturn(mock(AppStandbyInternal.class))

                .when(() -> LocalServices.getService(AppStandbyInternal.class));

        doReturn(mock(BatteryManagerInternal.class))

                .when(() -> LocalServices.getService(BatteryManagerInternal.class));

        doReturn(mUsageStatsManager)