diff options
| author | 2024-01-18 08:44:52 +0000 | |
|---|---|---|
| committer | 2024-01-18 08:44:52 +0000 | |
| commit | 9eb3faabc391f69b21296ed245e1ce1c0b7ee04b (patch) | |
| tree | 79ae01383521b64a61ebd45d4eed49d0fd4cf67b | |
| parent | fdbabfc434f18e9ae4218668abddad6ece3ce4a0 (diff) | |
Fix Mockito usage.
Using doReturn().when() is safer than when().thenReturn() for tests that
use multithreaded objects.
Bug: 236261941
Test: atest FrameworksMockingServicesTests:FlexibilityControllerTest
Change-Id: I1481e55082278ca2dc19033236fe4dfe84f3e46e
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java index 97767a5dbd89..284e491f8081 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java @@ -955,8 +955,7 @@ public class FlexibilityControllerTest { mJobStore.add(js); // Needed because if before and after Uid bias is the same, nothing happens. - when(mJobSchedulerService.getUidBias(mSourceUid)) - .thenReturn(JobInfo.BIAS_DEFAULT); + doReturn(JobInfo.BIAS_DEFAULT).when(mJobSchedulerService).getUidBias(mSourceUid); synchronized (mFlexibilityController.mLock) { mFlexibilityController.maybeStartTrackingJobLocked(js, null); |