| commit | e1eec119aff3aa204231cfb9c094e6381beea421 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Thu Jul 07 11:11:58 2022 +0100 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri Jul 15 19:52:37 2022 +0000 |
| tree | a7268d2e4d4bedd0c63d426b16e59dfb9f69b4d9 | |
| parent | 76c7d31f7188e5521978952a1a2f399b975dd8dd [diff] |
Use Mockito 4.6.1 API Bug: 236636175 Test: m ThemePickerRoboTests Change-Id: Ia1d57375170cd8b0c33f3685b2dc3ef0c52ab117 (cherry picked from commit 0ad99b54454168b4051c2975c9bd92bb73d8284d) 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 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;