| commit | 4a8115738d450db5538fd9f887945c8cf9e36cc9 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Thu Jul 07 11:11:58 2022 +0100 |
| committer | Sorin Basca <sorinbasca@google.com> | Sat Jul 16 08:05:38 2022 +0100 |
| tree | dbd4ea3ed0b07db2d50629461c4cbc57a80edd2d | |
| parent | 148c8053c3815928b78d4b7bb5a7a620464e88dd [diff] |
Use Mockito 4.6.1 API Bug: 236636175 Test: m ThemePickerRoboTests Change-Id: Ia1d57375170cd8b0c33f3685b2dc3ef0c52ab117 (cherry picked from commit e1eec119aff3aa204231cfb9c094e6381beea421) Merged-In: Ia1d57375170cd8b0c33f3685b2dc3ef0c52ab117
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..2b80bde 100644 --- a/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java +++ b/robolectric_tests/src/com/android/customization/model/clock/BaseClockManagerTest.java
@@ -19,8 +19,8 @@ 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.eq; 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 64a8389..ed47420 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;