Merge "Fix test."
This commit is contained in:
@@ -254,6 +254,12 @@ public class JobSchedulerServiceTest {
|
||||
|
||||
ConnectivityController connectivityController = mService.getConnectivityController();
|
||||
spyOn(connectivityController);
|
||||
mService.mConstants.RUNTIME_MIN_GUARANTEE_MS = 10 * MINUTE_IN_MILLIS;
|
||||
mService.mConstants.RUNTIME_MIN_DATA_TRANSFER_GUARANTEE_MS = 15 * MINUTE_IN_MILLIS;
|
||||
mService.mConstants.RUNTIME_DATA_TRANSFER_LIMIT_MS = 60 * MINUTE_IN_MILLIS;
|
||||
mService.mConstants.RUNTIME_MIN_USER_INITIATED_DATA_TRANSFER_GUARANTEE_BUFFER_FACTOR = 1.5f;
|
||||
mService.mConstants.RUNTIME_MIN_USER_INITIATED_DATA_TRANSFER_GUARANTEE_MS = HOUR_IN_MILLIS;
|
||||
mService.mConstants.RUNTIME_USER_INITIATED_DATA_TRANSFER_LIMIT_MS = 6 * HOUR_IN_MILLIS;
|
||||
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(ejMax));
|
||||
@@ -268,7 +274,7 @@ public class JobSchedulerServiceTest {
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobDef));
|
||||
grantRunLongJobsPermission(false); // Without permission
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_GUARANTEE_MS,
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_DATA_TRANSFER_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobDT));
|
||||
grantRunLongJobsPermission(true); // With permission
|
||||
doReturn(ConnectivityController.UNKNOWN_TIME)
|
||||
@@ -288,12 +294,16 @@ public class JobSchedulerServiceTest {
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_DATA_TRANSFER_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobDT));
|
||||
// UserInitiated
|
||||
grantRunLongJobsPermission(false);
|
||||
// Permission isn't granted, so it should just be treated as a regular data transfer job.
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_DATA_TRANSFER_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobUIDT));
|
||||
// Permission isn't granted, so it should just be treated as a regular job.
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobUI));
|
||||
grantRunLongJobsPermission(true); // With permission
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_USER_INITIATED_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobUI));
|
||||
grantRunLongJobsPermission(false);
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_USER_INITIATED_GUARANTEE_MS,
|
||||
mService.getMinJobExecutionGuaranteeMs(jobUIDT));
|
||||
grantRunLongJobsPermission(true); // With permission
|
||||
doReturn(ConnectivityController.UNKNOWN_TIME)
|
||||
.when(connectivityController).getEstimatedTransferTimeMs(any());
|
||||
assertEquals(mService.mConstants.RUNTIME_MIN_USER_INITIATED_DATA_TRANSFER_GUARANTEE_MS,
|
||||
|
||||
Reference in New Issue
Block a user