| commit | c307420e7338c6444008037f9aa1b4be84116630 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Fri Dec 16 23:35:48 2022 +0000 |
| committer | Kevin Liu <congxiliu@google.com> | Thu Jan 12 00:19:23 2023 +0000 |
| tree | f56f0898ff884bb291f4952dd630f0fa5c42abb2 | |
| parent | fddf411551fb63acfb2e08546a44c810c46ced56 [diff] |
New Use Mockito 4.6.1 API Address skipping merge issue Bug: 236636175 Test: atest ThemePickerRoboTests Change-Id: I1b41e516094b30e52d1a016a0801a13846611f91 Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802
diff --git a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java b/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java index c96e7f8..eeff531 100644 --- a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java +++ b/tests/robotests/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/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java b/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java index 89ca676..04ac024 100644 --- a/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java +++ b/tests/robotests/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;