| commit | d482c592265ec9fe958ee49c37c558ffd99fddb9 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Fri Dec 16 23:35:48 2022 +0000 |
| committer | Kevin Liu <congxiliu@google.com> | Wed Jan 04 22:04:37 2023 +0000 |
| tree | 59d89787de6f06024f40754a667dca1709e589f2 | |
| parent | d07c9a303e0782edd76a94868810b95864265899 [diff] |
Use Mockito 4.6.1 API Bug: 236636175 Test: atest ThemePickerRoboTests Change-Id: I2eee146a79a8de09777c60607cae10480e71ae47 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;