| commit | 6d5b67d4c6021c8c02b317de0d978e67f10ac5e0 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Fri Jan 13 15:41:27 2023 +0000 |
| committer | Kevin Liu <congxiliu@google.com> | Fri Jan 13 19:48:54 2023 +0000 |
| tree | ff7ac48d742c28af279b28951926c66e43e7e9f4 | |
| parent | be0f31d819add62ec0096b5be17ea30f89a65749 [diff] |
Address some mockito upgrade api change Also corrected the run_robotests.mk version to run the test Test: atest ThemePickerRoboTests Bug: 239218521 Change-Id: I3ce6061915988cf62d93ec4aa55ae21013acb001 Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802
diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk index 7d9b0e1..d9a7f55 100644 --- a/robolectric_tests/Android.mk +++ b/robolectric_tests/Android.mk
@@ -56,4 +56,4 @@ 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 c96e7f8..eeff531 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.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 4268725..f954656 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.Matchers.anyBoolean; +import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;