diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-07 08:13:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-07 08:13:55 +0000 |
| commit | 11aef8af06923493308e9a40a65a67694c79b95c (patch) | |
| tree | ff7ac48d742c28af279b28951926c66e43e7e9f4 | |
| parent | a763064ee59a0960eeb8f569935cc96a6d52b41c (diff) | |
| parent | 6d5b67d4c6021c8c02b317de0d978e67f10ac5e0 (diff) | |
| download | ThemePicker-11aef8af06923493308e9a40a65a67694c79b95c.tar.gz | |
Snap for 9572546 from 6d5b67d4c6021c8c02b317de0d978e67f10ac5e0 to mainline-adbd-releaseaml_adb_331610000
Change-Id: Ia5f1b7a6c60c6c5bb44be99243a454b2106b04d6
3 files changed, 3 insertions, 3 deletions
diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk index 7d9b0e12..d9a7f553 100644 --- a/robolectric_tests/Android.mk +++ b/robolectric_tests/Android.mk @@ -56,4 +56,4 @@ LOCAL_INSTRUMENT_SOURCE_DIRS := packages/apps/ThemePicker/src \ LOCAL_ROBOTEST_TIMEOUT := 36000 -include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk +include prebuilts/misc/common/robolectric/4.5.1/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 c96e7f8b..eeff5317 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 junit.framework.TestCase.fail; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.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 42687257..f9546563 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 @@ package com.android.customization.model.grid; import static junit.framework.TestCase.fail; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; |