diff options
author | Kevin Liu <congxiliu@google.com> | 2023-01-04 14:50:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-01-04 14:50:03 +0000 |
commit | 9e2ec49beb58b840d94bac90d2adb6e76257727f (patch) | |
tree | c5ad676f8be503e715f6860ff06892e1f5560de9 | |
parent | 8876d7cd98691049acbdede0593bd688bc6b3666 (diff) | |
parent | a20ae2994df3c16f51cf33d2d458e2f4f103c7fd (diff) | |
download | ThemePicker-9e2ec49beb58b840d94bac90d2adb6e76257727f.tar.gz |
Merge "Use Mockito 4.6.1 API" into tm-qpr-dev
-rw-r--r-- | tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java | 2 | ||||
-rw-r--r-- | tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 c96e7f8b..eeff5317 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 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.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 89ca6761..04ac0241 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 @@ package com.android.customization.model.grid; 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; |