| commit | 0f51c8497008b051ff491a3908c21a0abc015a80 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Mon Jan 09 21:32:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 09 21:32:24 2023 +0000 |
| tree | 7411734892ae29137b326ddfba3afa8ddebaa03a | |
| parent | c54b4cb296ba914c71fcc2eced43b9469377b6a1 [diff] | |
| parent | d482c592265ec9fe958ee49c37c558ffd99fddb9 [diff] |
[automerger skipped] Use Mockito 4.6.1 API am: d482c59226 -s ours am skip reason: Merged-In Ie6f34c840d31d24349fd12355f93369f51168802 with SHA-1 ec84e746ef is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20838242 Change-Id: I683d43db5173953bbd8821df0317f64874b2629b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk index d9a7f55..7d9b0e1 100644 --- a/robolectric_tests/Android.mk +++ b/robolectric_tests/Android.mk
@@ -56,4 +56,4 @@ LOCAL_ROBOTEST_TIMEOUT := 36000 -include prebuilts/misc/common/robolectric/4.5.1/run_robotests.mk +include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
diff --git a/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java b/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java index eeff531..c96e7f8 100644 --- a/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java +++ b/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
diff --git a/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java b/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java index f954656..4268725 100644 --- a/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java +++ b/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java
@@ -17,7 +17,7 @@ import static junit.framework.TestCase.fail; -import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;