| commit | 754669f414cc700850a603340ab11f7b1d56c5d9 | [log] [tgz] |
|---|---|---|
| author | Karen Lu <kxylu@google.com> | Thu Jan 05 05:22:27 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 05 05:22:27 2023 +0000 |
| tree | 7a909425f23baf9b08c23c8b81c289f73b048b8f | |
| parent | 9e2ec49beb58b840d94bac90d2adb6e76257727f [diff] | |
| parent | ee1770f7073990c56adf7f87d40c0b73c90de3e8 [diff] |
Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev
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 eeff531..c96e7f8 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.Mockito.anyBoolean; +import static org.mockito.Matchers.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 04ac024..89ca676 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.Mockito.anyBoolean; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;