From b7081c933b07d9794b2a2b80060944a85ced5ea8 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 30 Nov 2022 19:39:17 +0000 Subject: [PATCH] Use mocked JobParameters. Use a mock of JobParameters so the test doesn't have to changed or affected when the JobParameters constructor is changed. Bug: 253649458 Test: atest BackgroundDexOptServiceUnitTest Change-Id: I9daf063d40110e0193bb615d8a63b437d2527fd2 --- .../pm/BackgroundDexOptServiceUnitTest.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java index 5c3d695477557..01674bbc68598 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundDexOptServiceUnitTest.java @@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; @@ -107,12 +108,16 @@ public final class BackgroundDexOptServiceUnitTest { @Mock private BackgroundDexOptJobService mJobServiceForIdle; - private final JobParameters mJobParametersForPostBoot = new JobParameters(null, - BackgroundDexOptService.JOB_POST_BOOT_UPDATE, null, null, null, - 0, false, false, null, null, null); - private final JobParameters mJobParametersForIdle = new JobParameters(null, - BackgroundDexOptService.JOB_IDLE_OPTIMIZE, null, null, null, - 0, false, false, null, null, null); + private final JobParameters mJobParametersForPostBoot = + createJobParameters(BackgroundDexOptService.JOB_POST_BOOT_UPDATE); + private final JobParameters mJobParametersForIdle = + createJobParameters(BackgroundDexOptService.JOB_IDLE_OPTIMIZE); + + private static JobParameters createJobParameters(int jobId) { + JobParameters params = mock(JobParameters.class); + when(params.getJobId()).thenReturn(jobId); + return params; + } private BackgroundDexOptService mService;