summaryrefslogtreecommitdiff
path: root/tests/robotests
diff options
context:
space:
mode:
authorKaren Lu <kxylu@google.com>2023-01-05 05:14:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-01-05 05:14:59 +0000
commitee1770f7073990c56adf7f87d40c0b73c90de3e8 (patch)
treecc46596c79e97d5f008e8de9b9686ccdc41b8da4 /tests/robotests
parenta20ae2994df3c16f51cf33d2d458e2f4f103c7fd (diff)
downloadThemePicker-ee1770f7073990c56adf7f87d40c0b73c90de3e8.tar.gz
Revert "Use Mockito 4.6.1 API"
Revert submission 20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf Reason for revert: Breaking the build on tm-qpr-dev. Bug tracked here: b/264473028 Reverted changes: /q/submissionid:20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf Change-Id: Iec7784f4db6ef6f4005fa246022e701ac8c7cdbd
Diffstat (limited to 'tests/robotests')
-rw-r--r--tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java2
-rw-r--r--tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java2
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 eeff5317..c96e7f8b 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.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 04ac0241..89ca6761 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.Mockito.anyBoolean;
+import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;