Upgrade all JVM host tests to mockito 4
This is required step to prepare for JDK 17 upgrade as
existing mockito is unable to mock code produced by JDK 17.
Suppress deprecation of usages of MockitoAnnotations.initMocks
Test: ./gradlew test
Change-Id: Ic3df8005e15ce26768187323c66aba9a0f308f2f
diff --git a/ads/ads-identifier-common/build.gradle b/ads/ads-identifier-common/build.gradle
index 3dc9ae3..26cd193 100644
--- a/ads/ads-identifier-common/build.gradle
+++ b/ads/ads-identifier-common/build.gradle
@@ -28,7 +28,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.junit)
testImplementation(libs.truth)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
}
diff --git a/arch/core/core-common/build.gradle b/arch/core/core-common/build.gradle
index 57fcfca..450e35a 100644
--- a/arch/core/core-common/build.gradle
+++ b/arch/core/core-common/build.gradle
@@ -25,7 +25,7 @@
api("androidx.annotation:annotation:1.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
index 9b82c05..a67bf13 100644
--- a/biometric/biometric/build.gradle
+++ b/biometric/biometric/build.gradle
@@ -48,7 +48,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
diff --git a/biometric/biometric/src/test/java/androidx/biometric/AuthenticationCallbackProviderTest.java b/biometric/biometric/src/test/java/androidx/biometric/AuthenticationCallbackProviderTest.java
index 6d44449..8051f34 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/AuthenticationCallbackProviderTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/AuthenticationCallbackProviderTest.java
@@ -21,7 +21,6 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.os.Build;
@@ -49,6 +48,7 @@
private AuthenticationCallbackProvider mAuthenticationCallbackProvider;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -102,7 +102,7 @@
mAuthenticationCallbackProvider.getBiometricCallback()
.onAuthenticationHelp(helpCode, helpMessage);
- verifyZeroInteractions(mListener);
+ verifyNoMoreInteractions(mListener);
}
@Test
diff --git a/biometric/biometric/src/test/java/androidx/biometric/BiometricManagerTest.java b/biometric/biometric/src/test/java/androidx/biometric/BiometricManagerTest.java
index 7dfa19d..7112cb4 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/BiometricManagerTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/BiometricManagerTest.java
@@ -55,6 +55,7 @@
private Context mContext;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java b/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java
index fe7c7be..69c3f64 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/CancellationSignalProviderTest.java
@@ -47,6 +47,7 @@
private CancellationSignalProvider.Injector mFieldMockInjector;
private CancellationSignalProvider.Injector mNewMockInjector;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/biometric/biometric/src/test/java/androidx/biometric/CryptoObjectUtilsTest.java b/biometric/biometric/src/test/java/androidx/biometric/CryptoObjectUtilsTest.java
index 2ef9fdf3..7b28b24 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/CryptoObjectUtilsTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/CryptoObjectUtilsTest.java
@@ -43,6 +43,7 @@
@Mock private Mac mMac;
@Mock private Signature mSignature;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/biometric/biometric/src/test/java/androidx/biometric/KeyguardUtilsTest.java b/biometric/biometric/src/test/java/androidx/biometric/KeyguardUtilsTest.java
index 453f6a9..087c330 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/KeyguardUtilsTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/KeyguardUtilsTest.java
@@ -43,6 +43,7 @@
@Mock private Context mContext;
@Mock private KeyguardManager mKeyguardManager;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/biometric/biometric/src/test/java/androidx/biometric/PackageUtilsTest.java b/biometric/biometric/src/test/java/androidx/biometric/PackageUtilsTest.java
index de5cebc..6c9e29f 100644
--- a/biometric/biometric/src/test/java/androidx/biometric/PackageUtilsTest.java
+++ b/biometric/biometric/src/test/java/androidx/biometric/PackageUtilsTest.java
@@ -40,6 +40,7 @@
@Mock private Context mContext;
@Mock private PackageManager mPackageManager;
+ @SuppressWarnings("deprecation") // b/251211046
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index 69034ed..31aa32b 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -31,7 +31,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.junit)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
androidTestImplementation("androidx.appcompat:appcompat:1.1.0")
androidTestImplementation(libs.testExtJunit)
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 3272217..798dd71 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -59,7 +59,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.junit)
testImplementation(libs.truth)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(project(":camera:camera-camera2-pipe-testing"))
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 190ef69..8f89ced 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -38,7 +38,7 @@
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.kotlinCoroutinesTest)
testImplementation("androidx.annotation:annotation-experimental:1.1.0")
testImplementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index de3bb7b..4a8647b 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -46,7 +46,7 @@
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(project(":camera:camera-testing"), {
exclude group: "androidx.camera", module: "camera-core"
})
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 6422e1e..f78b5e8 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -35,7 +35,7 @@
compileOnly(project(":camera:camera-extensions-stub"))
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation(project(":camera:camera-testing"))
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingCaptureProcessorTest.kt b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingCaptureProcessorTest.kt
index 801b221..54cb68d 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingCaptureProcessorTest.kt
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingCaptureProcessorTest.kt
@@ -55,7 +55,7 @@
callOnInitAndVerify()
adaptingCaptureProcessor.close()
adaptingCaptureProcessor.process(imageProxyBundle)
- Mockito.verifyZeroInteractions(captureProcessorImpl)
+ Mockito.verifyNoMoreInteractions(captureProcessorImpl)
}
@Test
@@ -63,7 +63,7 @@
adaptingCaptureProcessor.close()
adaptingCaptureProcessor.onOutputSurface(Mockito.mock(Surface::class.java), 0)
adaptingCaptureProcessor.onInit()
- Mockito.verifyZeroInteractions(captureProcessorImpl)
+ Mockito.verifyNoMoreInteractions(captureProcessorImpl)
}
@Test
@@ -71,7 +71,7 @@
adaptingCaptureProcessor.close()
adaptingCaptureProcessor.onResolutionUpdate(Size(640, 480))
adaptingCaptureProcessor.onInit()
- Mockito.verifyZeroInteractions(captureProcessorImpl)
+ Mockito.verifyNoMoreInteractions(captureProcessorImpl)
}
@Test
@@ -86,7 +86,7 @@
callOnInitAndVerify()
adaptingCaptureProcessor.onDeInit()
adaptingCaptureProcessor.process(imageProxyBundle)
- Mockito.verifyZeroInteractions(captureProcessorImpl)
+ Mockito.verifyNoMoreInteractions(captureProcessorImpl)
}
private fun createFakeImageProxyBundle(
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingPreviewProcessorTest.java b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingPreviewProcessorTest.java
index f801b25..ba9d15b 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingPreviewProcessorTest.java
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingPreviewProcessorTest.java
@@ -22,7 +22,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.media.Image;
import android.os.Build;
@@ -73,7 +73,7 @@
mAdaptingPreviewProcessor.process(mImageProxyBundle);
mAdaptingPreviewProcessor.onInit();
- verifyZeroInteractions(mImpl);
+ verifyNoMoreInteractions(mImpl);
}
@Test
@@ -82,7 +82,7 @@
mAdaptingPreviewProcessor.onOutputSurface(mock(Surface.class), 0);
mAdaptingPreviewProcessor.onInit();
- verifyZeroInteractions(mImpl);
+ verifyNoMoreInteractions(mImpl);
}
@Test
@@ -91,7 +91,7 @@
mAdaptingPreviewProcessor.onResolutionUpdate(new Size(640, 480));
mAdaptingPreviewProcessor.onInit();
- verifyZeroInteractions(mImpl);
+ verifyNoMoreInteractions(mImpl);
}
@Test
@@ -107,7 +107,7 @@
mAdaptingPreviewProcessor.onDeInit();
mAdaptingPreviewProcessor.process(mImageProxyBundle);
- verifyZeroInteractions(mImpl);
+ verifyNoMoreInteractions(mImpl);
}
private void callOnInitAndVerify() {
diff --git a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingRequestUpdateProcessorTest.java b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingRequestUpdateProcessorTest.java
index 832cfa0..ff8b784 100644
--- a/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingRequestUpdateProcessorTest.java
+++ b/camera/camera-extensions/src/test/java/androidx/camera/extensions/internal/AdaptingRequestUpdateProcessorTest.java
@@ -18,7 +18,7 @@
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.hardware.camera2.CaptureResult;
@@ -73,7 +73,7 @@
mAdaptingRequestUpdateProcessor.getCaptureStage();
- verifyZeroInteractions(mPreviewExtenderImpl);
+ verifyNoMoreInteractions(mPreviewExtenderImpl);
}
@Test
@@ -82,7 +82,7 @@
mAdaptingRequestUpdateProcessor.process(mImageInfo);
- verifyZeroInteractions(mImpl);
+ verifyNoMoreInteractions(mImpl);
}
/**
diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle
index e8c3d42..3715943 100644
--- a/camera/camera-mlkit-vision/build.gradle
+++ b/camera/camera-mlkit-vision/build.gradle
@@ -32,7 +32,7 @@
}
}
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.testRunner)
testImplementation(libs.robolectric)
testImplementation(libs.kotlinStdlib)
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index 0f1d9ca..ec539d7 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -46,7 +46,7 @@
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
android {
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index ce37b7e..ea1bffd 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -43,7 +43,7 @@
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation("androidx.core:core-ktx:1.1.0")
testImplementation(project(":camera:camera-testing"), {
exclude group: "androidx.camera", module: "camera-core"
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index 56a6b62..fc7bb75 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -40,7 +40,7 @@
annotationProcessor(libs.autoValue)
testImplementation(libs.testRunner)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.kotlinStdlib)
testImplementation(libs.truth)
diff --git a/camera/camera-viewfinder/build.gradle b/camera/camera-viewfinder/build.gradle
index a0f4602d..873496e 100644
--- a/camera/camera-viewfinder/build.gradle
+++ b/camera/camera-viewfinder/build.gradle
@@ -39,7 +39,7 @@
annotationProcessor(libs.autoValue)
testImplementation(libs.testRunner)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.kotlinStdlib)
testImplementation(libs.truth)
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index 1140f784..bac38c9 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -44,7 +44,7 @@
testImplementation(libs.testRules)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation("androidx.fragment:fragment-testing:1.2.3")
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/AutomotiveCarHardwareManagerTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/AutomotiveCarHardwareManagerTest.java
index 80e01da..b780ef0 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/AutomotiveCarHardwareManagerTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/AutomotiveCarHardwareManagerTest.java
@@ -60,6 +60,7 @@
private Application mContext;
private ShadowApplication mShadowApplication;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/climate/AutomotiveCarClimateTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/climate/AutomotiveCarClimateTest.java
index 78cdd50..cc92e05 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/climate/AutomotiveCarClimateTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/climate/AutomotiveCarClimateTest.java
@@ -127,6 +127,7 @@
@Mock
private PropertyManager mPropertyManager;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/MockedCarTestBase.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/MockedCarTestBase.java
index 9b2f0da..3e51de2 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/MockedCarTestBase.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/MockedCarTestBase.java
@@ -115,6 +115,7 @@
@Mock
private CarPropertyManager mCarPropertyManagerMock;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
index 38dd84e..3604d4d 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyManagerTest.java
@@ -52,6 +52,7 @@
Collections.singletonList(CarZone.CAR_ZONE_GLOBAL);
private PropertyManager mPropertyManager;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
super.setUp();
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyRequestProcessorTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyRequestProcessorTest.java
index 94253fa..085fb11 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyRequestProcessorTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/common/PropertyRequestProcessorTest.java
@@ -54,6 +54,7 @@
public class PropertyRequestProcessorTest extends MockedCarTestBase {
private static final int WAIT_CALLBACK_MS = 50;
private PropertyRequestProcessor mRequestProcessor;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
super.setUp();
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
index b383736..52f3fa4 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
@@ -113,6 +113,7 @@
private static final List<CarZone> GLOBAL_ZONE = Collections.singletonList(
CarZone.CAR_ZONE_GLOBAL);
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarSensorsTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarSensorsTest.java
index 75f3e95..64594ba 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarSensorsTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarSensorsTest.java
@@ -52,6 +52,7 @@
@Mock
private OnCarDataAvailableListener<CarHardwareLocation> mCarHardwareLocationListener;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/suggestion/SuggestionManagerTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/suggestion/SuggestionManagerTest.java
index 0986998..9595975 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/suggestion/SuggestionManagerTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/suggestion/SuggestionManagerTest.java
@@ -66,6 +66,7 @@
new Suggestion.Builder().setIdentifier(mIdentifier).setTitle(mTitle).setSubtitle(
mSubTitle).setIcon(mIcon).setAction(mPendingIntent).build();
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index bac1356..6ebd606a 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -31,7 +31,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation project(path: ':car:app:app-testing')
diff --git a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarHardwareHostDispatcherTest.java b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarHardwareHostDispatcherTest.java
index 006edc6..8f86245 100644
--- a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarHardwareHostDispatcherTest.java
+++ b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarHardwareHostDispatcherTest.java
@@ -57,6 +57,7 @@
new CarHardwareHostDispatcher(mHostDispatcher);
private TestCarHardwareHostStub mCarHardwareHost;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubMapTest.java b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubMapTest.java
index 0b75733..632a499 100644
--- a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubMapTest.java
+++ b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubMapTest.java
@@ -75,6 +75,7 @@
@Mock
OnCarDataAvailableListener<String> mMockCarDataStringListener;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubTest.java b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubTest.java
index 7215449..ca32748 100644
--- a/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubTest.java
+++ b/car/app/app-projected/src/test/java/androidx/car/app/hardware/common/CarResultStubTest.java
@@ -60,6 +60,7 @@
@Mock
OnCarDataAvailableListener<Integer> mMockCarDataListener;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index 1458882..5262400 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -37,7 +37,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
diff --git a/car/app/app-testing/src/test/java/androidx/car/app/testing/ScreenControllerTest.java b/car/app/app-testing/src/test/java/androidx/car/app/testing/ScreenControllerTest.java
index 2c21047..7bc4a81 100644
--- a/car/app/app-testing/src/test/java/androidx/car/app/testing/ScreenControllerTest.java
+++ b/car/app/app-testing/src/test/java/androidx/car/app/testing/ScreenControllerTest.java
@@ -51,6 +51,7 @@
private ScreenController mScreenController;
private TestCarContext mCarContext;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app-testing/src/test/java/androidx/car/app/testing/SessionControllerTest.java b/car/app/app-testing/src/test/java/androidx/car/app/testing/SessionControllerTest.java
index f52934e..af90720 100644
--- a/car/app/app-testing/src/test/java/androidx/car/app/testing/SessionControllerTest.java
+++ b/car/app/app-testing/src/test/java/androidx/car/app/testing/SessionControllerTest.java
@@ -54,6 +54,7 @@
private Intent mIntent;
private Intent mScreenIntent;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index a6b6f9b..da527c4 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -68,7 +68,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation project(path: ':car:app:app-testing')
diff --git a/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java b/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java
index dea3532..975bfcd 100644
--- a/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/AppManagerTest.java
@@ -91,6 +91,7 @@
private AppManager mAppManager;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/CarAppBinderTest.java b/car/app/app/src/test/java/androidx/car/app/CarAppBinderTest.java
index 1c46b90..aaf0b6e 100644
--- a/car/app/app/src/test/java/androidx/car/app/CarAppBinderTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/CarAppBinderTest.java
@@ -94,6 +94,7 @@
private CarAppBinder mCarAppBinder;
private Intent mIntentSet;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/CarAppPermissionActivityTest.java b/car/app/app/src/test/java/androidx/car/app/CarAppPermissionActivityTest.java
index 3ef8603..0e858c2 100644
--- a/car/app/app/src/test/java/androidx/car/app/CarAppPermissionActivityTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/CarAppPermissionActivityTest.java
@@ -57,6 +57,7 @@
private ActivityScenario<CarAppPermissionActivity> mActivity;
private Application mApplication;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/CarContextTest.java b/car/app/app/src/test/java/androidx/car/app/CarContextTest.java
index f3e6583..608d91d 100644
--- a/car/app/app/src/test/java/androidx/car/app/CarContextTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/CarContextTest.java
@@ -95,6 +95,7 @@
private Screen mScreen2;
private final TestLifecycleOwner mLifecycleOwner = new TestLifecycleOwner();
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/HostDispatcherTest.java b/car/app/app/src/test/java/androidx/car/app/HostDispatcherTest.java
index bb67654..bf127d0 100644
--- a/car/app/app/src/test/java/androidx/car/app/HostDispatcherTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/HostDispatcherTest.java
@@ -55,6 +55,7 @@
private ISuggestionHost mSuggestionHost;
private HostDispatcher mHostDispatcher = new HostDispatcher();
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/ScreenManagerTest.java b/car/app/app/src/test/java/androidx/car/app/ScreenManagerTest.java
index 3035593..fcc4022 100644
--- a/car/app/app/src/test/java/androidx/car/app/ScreenManagerTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/ScreenManagerTest.java
@@ -75,6 +75,7 @@
private ScreenManager mScreenManager;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/ScreenTest.java b/car/app/app/src/test/java/androidx/car/app/ScreenTest.java
index 4f9bb46..a6dfd53 100644
--- a/car/app/app/src/test/java/androidx/car/app/ScreenTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/ScreenTest.java
@@ -54,6 +54,7 @@
private Screen mScreen;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/connection/AutomotiveCarConnectionTypeLiveDataTest.java b/car/app/app/src/test/java/androidx/car/app/connection/AutomotiveCarConnectionTypeLiveDataTest.java
index aeb08a8..ae1edef 100644
--- a/car/app/app/src/test/java/androidx/car/app/connection/AutomotiveCarConnectionTypeLiveDataTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/connection/AutomotiveCarConnectionTypeLiveDataTest.java
@@ -34,6 +34,7 @@
public class AutomotiveCarConnectionTypeLiveDataTest {
@Mock private Observer<Integer> mMockObserver;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/connection/CarConnectionTypeLiveDataTest.java b/car/app/app/src/test/java/androidx/car/app/connection/CarConnectionTypeLiveDataTest.java
index 9262c44..1d22cb9 100644
--- a/car/app/app/src/test/java/androidx/car/app/connection/CarConnectionTypeLiveDataTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/connection/CarConnectionTypeLiveDataTest.java
@@ -64,6 +64,7 @@
private CarConnectionTypeLiveData mCarConnectionTypeLiveData;
private TestContentProvider mContentProvider;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/constraints/ConstraintManagerTest.java b/car/app/app/src/test/java/androidx/car/app/constraints/ConstraintManagerTest.java
index 4a905e5..fb4244d 100644
--- a/car/app/app/src/test/java/androidx/car/app/constraints/ConstraintManagerTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/constraints/ConstraintManagerTest.java
@@ -59,6 +59,7 @@
private ConstraintManager mConstraintManager;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/model/ItemListTest.java b/car/app/app/src/test/java/androidx/car/app/model/ItemListTest.java
index b947182..5d3abf3 100644
--- a/car/app/app/src/test/java/androidx/car/app/model/ItemListTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/model/ItemListTest.java
@@ -58,6 +58,7 @@
@Mock
private IOnDoneCallback.Stub mMockOnDoneCallback;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/navigation/NavigationManagerTest.java b/car/app/app/src/test/java/androidx/car/app/navigation/NavigationManagerTest.java
index 4916000..1b47039 100644
--- a/car/app/app/src/test/java/androidx/car/app/navigation/NavigationManagerTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/navigation/NavigationManagerTest.java
@@ -89,6 +89,7 @@
.build();
private TestCarContext mTestCarContext;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTest.java b/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTest.java
index 92c4f48..4c9edf9 100644
--- a/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTest.java
+++ b/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTest.java
@@ -73,6 +73,7 @@
@Mock
private Resources mResources;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTestApi28.java b/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTestApi28.java
index cdff5ce..79d481b 100644
--- a/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTestApi28.java
+++ b/car/app/app/src/test/java/androidx/car/app/validation/HostValidatorTestApi28.java
@@ -67,6 +67,7 @@
@Mock
private Resources mResources;
+ @SuppressWarnings("deprecation") // b/239955611
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 3c02bb4..1d0a744 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -52,9 +52,9 @@
testImplementation(libs.truth)
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.kotlinTest)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.kotlinReflect)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoKotlin4)
androidTestImplementation(project(":compose:test-utils"))
androidTestImplementation(project(":internal-testutils-fonts"))
@@ -116,10 +116,10 @@
implementation(libs.testRules)
implementation(libs.testRunner)
implementation(libs.junit)
- implementation(libs.mockitoCore)
+ implementation(libs.mockitoCore4)
implementation(libs.truth)
implementation(libs.kotlinReflect)
- implementation(libs.mockitoKotlin)
+ implementation(libs.mockitoKotlin4)
}
commonTest.dependencies {
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextControllerTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextControllerTest.kt
index 29a5f39..9ff9b59 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextControllerTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextControllerTest.kt
@@ -18,8 +18,8 @@
import androidx.compose.ui.text.AnnotatedString
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextDelegateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextDelegateTest.kt
index ed21815..d2ceef2 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextDelegateTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextDelegateTest.kt
@@ -22,7 +22,7 @@
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Density
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
index 9296223..f936cd5 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
@@ -33,12 +33,12 @@
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.LayoutDirection
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyBlocking
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyBlocking
+import org.mockito.kotlin.whenever
import kotlinx.coroutines.runBlocking
import org.junit.Before
import org.junit.Test
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
index d586f8f..3ced499 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
@@ -38,13 +38,13 @@
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextDecoration
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.inOrder
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.inOrder
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt
index fb19cb8..80a615d 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextFieldStateTest.kt
@@ -18,7 +18,7 @@
import androidx.compose.runtime.snapshots.Snapshot
import com.google.common.truth.Truth
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextLayoutHelperTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextLayoutHelperTest.kt
index 1d6a86b..4420a2b 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextLayoutHelperTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextLayoutHelperTest.kt
@@ -33,8 +33,8 @@
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextSelectionLongPressDragTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextSelectionLongPressDragTest.kt
index 05d810f..832cddb 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextSelectionLongPressDragTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextSelectionLongPressDragTest.kt
@@ -33,12 +33,12 @@
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.LayoutDirection
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt
index 236dcab..9fddbbd 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/TextStateTest.kt
@@ -18,7 +18,7 @@
import androidx.compose.runtime.snapshots.Snapshot
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionAdjustmentTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionAdjustmentTest.kt
index fa633cf..1c52b7c 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionAdjustmentTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionAdjustmentTest.kt
@@ -29,8 +29,8 @@
import androidx.compose.ui.util.packInts
import androidx.test.filters.SmallTest
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerDragTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerDragTest.kt
index dcadda7..6f49d4c 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerDragTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerDragTest.kt
@@ -24,10 +24,10 @@
import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.compose.ui.unit.IntSize
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerTest.kt
index c9f6abe..2e206d7 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionManagerTest.kt
@@ -26,17 +26,17 @@
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.ResolvedTextDirection
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argThat
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.isNull
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
index 77af370..0c8f63b 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/SelectionRegistrarImplTest.kt
@@ -20,8 +20,8 @@
import androidx.compose.ui.layout.LayoutCoordinates
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
index 5bdc120..c0a54f5 100644
--- a/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
+++ b/compose/foundation/foundation/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
@@ -45,14 +45,14 @@
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.util.packInts
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.anyOrNull
-import com.nhaarman.mockitokotlin2.isNull
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.isNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index 4208e21..c447adf 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -62,8 +62,8 @@
testImplementation(project(":compose:test-utils"))
testImplementation(libs.truth)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
androidTestImplementation("androidx.activity:activity-compose:1.3.1")
androidTestImplementation(project(":compose:material:material"))
@@ -115,8 +115,6 @@
androidCommonTest.dependencies {
implementation(project(":compose:test-utils"))
implementation(libs.truth)
- implementation(libs.mockitoCore)
- implementation(libs.mockitoKotlin)
}
// TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
@@ -124,13 +122,16 @@
// level dependencies block instead:
// `dependencies { testImplementation(libs.robolectric) }`
androidTest.dependencies {
- // Empty, but kept for the sake of the comment above
+ implementation(libs.mockitoCore4)
+ implementation(libs.mockitoKotlin4)
}
androidAndroidTest.dependencies {
implementation(project(":compose:material:material"))
implementation(project(":compose:ui:ui-test-junit4"))
implementation("androidx.activity:activity-compose:1.3.1")
+ implementation(libs.mockitoCore)
+ implementation(libs.mockitoKotlin)
implementation(libs.dexmakerMockito)
}
diff --git a/compose/ui/ui-test/src/test/kotlin/androidx/compose/ui/test/inputdispatcher/InputDispatcherTest.kt b/compose/ui/ui-test/src/test/kotlin/androidx/compose/ui/test/inputdispatcher/InputDispatcherTest.kt
index 46e80d4..a86efdb 100644
--- a/compose/ui/ui-test/src/test/kotlin/androidx/compose/ui/test/inputdispatcher/InputDispatcherTest.kt
+++ b/compose/ui/ui-test/src/test/kotlin/androidx/compose/ui/test/inputdispatcher/InputDispatcherTest.kt
@@ -31,9 +31,9 @@
import androidx.compose.ui.test.util.InputEventRecorder
import androidx.compose.ui.test.util.assertNoTouchGestureInProgress
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
import org.junit.After
@OptIn(InternalTestApi::class)
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index e257a12..1b215ad 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -51,11 +51,11 @@
testImplementation(libs.testRules)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.kotlinReflect)
testImplementation(libs.kotlinTest)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoKotlin4)
androidTestImplementation(project(":internal-testutils-fonts"))
androidTestImplementation(project(":compose:ui:ui-test-junit4"))
@@ -144,11 +144,11 @@
implementation(libs.testRules)
implementation(libs.testRunner)
implementation(libs.junit)
- implementation(libs.mockitoCore)
+ implementation(libs.mockitoCore4)
implementation(libs.truth)
implementation(libs.kotlinReflect)
implementation(libs.kotlinTest)
- implementation(libs.mockitoKotlin)
+ implementation(libs.mockitoKotlin4)
}
androidAndroidTest.dependencies {
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
index bf1b5e1..01b844a 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
@@ -17,7 +17,7 @@
package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
index 10b25c6..998ac9c 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
@@ -24,12 +24,12 @@
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.input.TextInputService
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.any
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
index 61f0a3b..dc71dd4 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
@@ -19,14 +19,14 @@
import androidx.compose.ui.text.InternalTextApi
import androidx.compose.ui.text.TextRange
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import kotlin.test.assertFailsWith
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index ba22b8b..472ddb1 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -72,8 +72,8 @@
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.junit)
testImplementation(libs.truth)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.robolectric)
testImplementation(project(":compose:ui:ui-test-junit4"))
testImplementation(project(":compose:test-utils"))
@@ -190,8 +190,8 @@
implementation(libs.kotlinCoroutinesTest)
implementation(libs.junit)
implementation(libs.truth)
- implementation(libs.mockitoCore)
- implementation(libs.mockitoKotlin)
+ implementation(libs.mockitoCore4)
+ implementation(libs.mockitoKotlin4)
implementation(project(":compose:ui:ui-test-junit4"))
implementation(project(":internal-testutils-fonts"))
implementation(project(":compose:test-utils"))
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedbackTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedbackTest.kt
index 28672b7..60064cf 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedbackTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedbackTest.kt
@@ -18,10 +18,10 @@
import android.view.HapticFeedbackConstants
import android.view.View
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionInactiveTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionInactiveTest.kt
index 12e99e7..fa9d451 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionInactiveTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionInactiveTest.kt
@@ -21,7 +21,7 @@
import androidx.compose.ui.text.input.RecordingInputConnection
import androidx.compose.ui.text.input.TextFieldValue
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
index bb39d23..7a9486c 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
@@ -25,13 +25,13 @@
import androidx.compose.ui.text.input.RecordingInputConnection
import androidx.compose.ui.text.input.TextFieldValue
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.never
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
index 861b58e..32854e2 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidCommandDebouncingTest.kt
@@ -20,8 +20,8 @@
import android.view.View
import android.view.inputmethod.ExtractedText
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index 6b1a161..6896b81 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -59,8 +59,8 @@
testImplementation(libs.junit)
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.kotlinTest)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.robolectric)
testImplementation(libs.testCore)
testImplementation(libs.testRules)
diff --git a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/GlanceAppWidgetTest.kt b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/GlanceAppWidgetTest.kt
index a44968f..3979e10 100644
--- a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/GlanceAppWidgetTest.kt
+++ b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/GlanceAppWidgetTest.kt
@@ -36,7 +36,7 @@
import androidx.glance.text.Text
import androidx.test.core.app.ApplicationProvider
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.test.TestScope
diff --git a/glance/glance-wear-tiles/build.gradle b/glance/glance-wear-tiles/build.gradle
index c5964c5..cd8d37f 100644
--- a/glance/glance-wear-tiles/build.gradle
+++ b/glance/glance-wear-tiles/build.gradle
@@ -50,8 +50,8 @@
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.robolectric)
testImplementation(libs.kotlinReflect)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation("androidx.core:core-ktx:1.7.0")
testImplementation("androidx.wear.tiles:tiles-testing:1.0.0")
diff --git a/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/BorderTest.kt b/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/BorderTest.kt
index f251633..b38fd4e 100644
--- a/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/BorderTest.kt
+++ b/glance/glance-wear-tiles/src/test/kotlin/androidx/glance/wear/tiles/BorderTest.kt
@@ -24,8 +24,8 @@
import androidx.glance.findModifier
import androidx.glance.unit.ColorProvider
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
import org.junit.Test
class BorderTest {
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 182bfb3..4fb08c4 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -50,8 +50,8 @@
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.kotlinTest)
testImplementation(libs.kotlinReflect)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation("androidx.datastore:datastore-core:1.0.0")
testImplementation("androidx.datastore:datastore-preferences-core:1.0.0")
testImplementation("androidx.datastore:datastore-preferences:1.0.0-rc02")
diff --git a/glance/glance/src/test/kotlin/androidx/glance/layout/PaddingTest.kt b/glance/glance/src/test/kotlin/androidx/glance/layout/PaddingTest.kt
index 1e9e060..8b6a366 100644
--- a/glance/glance/src/test/kotlin/androidx/glance/layout/PaddingTest.kt
+++ b/glance/glance/src/test/kotlin/androidx/glance/layout/PaddingTest.kt
@@ -21,8 +21,8 @@
import androidx.glance.GlanceModifier
import androidx.glance.findModifier
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
import org.junit.Test
class PaddingTest {
diff --git a/health/connect/connect-client/build.gradle b/health/connect/connect-client/build.gradle
index 1055380..3d22950 100644
--- a/health/connect/connect-client/build.gradle
+++ b/health/connect/connect-client/build.gradle
@@ -50,7 +50,7 @@
testImplementation(libs.truth)
testImplementation(libs.kotlinCoroutinesTest)
androidTestImplementation(libs.testRules)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.testExtJunit)
testImplementation(libs.kotlinTest)
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index c1e3d0a..1b3b2a2 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -40,7 +40,7 @@
androidTestImplementation(libs.truth)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testAnnotationProcessor(project(":lifecycle:lifecycle-compiler"))
}
diff --git a/lifecycle/lifecycle-common-java8/build.gradle b/lifecycle/lifecycle-common-java8/build.gradle
index 29e84d3..f4af9fe 100644
--- a/lifecycle/lifecycle-common-java8/build.gradle
+++ b/lifecycle/lifecycle-common-java8/build.gradle
@@ -26,7 +26,7 @@
api("androidx.annotation:annotation:1.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/lifecycle/lifecycle-common/build.gradle b/lifecycle/lifecycle-common/build.gradle
index 644cc9a..70a07f9 100644
--- a/lifecycle/lifecycle-common/build.gradle
+++ b/lifecycle/lifecycle-common/build.gradle
@@ -25,7 +25,7 @@
api("androidx.annotation:annotation:1.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
constraints {
implementation(project(":lifecycle:lifecycle-common-java8"))
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index 81acc67..cf246c3 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -36,7 +36,7 @@
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.truth)
diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle
index 9ffdaa9..d42633e 100644
--- a/lifecycle/lifecycle-livedata-core-truth/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle
@@ -28,7 +28,7 @@
api(libs.truth)
api(libs.kotlinStdlib)
testImplementation(libs.truth)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(project(":internal-testutils-truth"))
}
diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle
index 993634f..786db12 100644
--- a/lifecycle/lifecycle-livedata-core/build.gradle
+++ b/lifecycle/lifecycle-livedata-core/build.gradle
@@ -31,7 +31,7 @@
testImplementation(project(":lifecycle:lifecycle-runtime-testing"))
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
constraints {
implementation(project(":lifecycle:lifecycle-common"))
diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle
index c30b500..01b408a 100644
--- a/lifecycle/lifecycle-livedata/build.gradle
+++ b/lifecycle/lifecycle-livedata/build.gradle
@@ -30,7 +30,7 @@
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
constraints {
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle
index 186b49b..f3397125 100644
--- a/lifecycle/lifecycle-process/build.gradle
+++ b/lifecycle/lifecycle-process/build.gradle
@@ -35,7 +35,7 @@
api("androidx.annotation:annotation:1.2.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index 1efca5e..03f363c 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -21,7 +21,7 @@
implementation("androidx.arch.core:core-runtime:2.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.testExtJunit)
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index 52d7d48..21eb489 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -35,7 +35,7 @@
api("androidx.annotation:annotation:1.1.0")
api(libs.kotlinStdlib)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
constraints {
diff --git a/navigation/integration-tests/safeargs-testapp/build.gradle b/navigation/integration-tests/safeargs-testapp/build.gradle
index 93ebf64e..623dd80 100644
--- a/navigation/integration-tests/safeargs-testapp/build.gradle
+++ b/navigation/integration-tests/safeargs-testapp/build.gradle
@@ -64,5 +64,5 @@
dependencies {
implementation "${LibraryGroups.NAVIGATION}:navigation-runtime:${LibraryVersions.NAVIGATION}"
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle
index 1428843..31e3381 100644
--- a/navigation/navigation-common/build.gradle
+++ b/navigation/navigation-common/build.gradle
@@ -42,7 +42,7 @@
testImplementation(project(":navigation:navigation-testing"))
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.kotlinStdlib)
testImplementation(libs.kotlinCoroutinesTest)
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle
index bd7895b..8631ad3 100644
--- a/navigation/navigation-dynamic-features-fragment/build.gradle
+++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -38,7 +38,7 @@
testImplementation(libs.testExtJunit)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle
index 20863e1..4adba73 100644
--- a/navigation/navigation-dynamic-features-runtime/build.gradle
+++ b/navigation/navigation-dynamic-features-runtime/build.gradle
@@ -40,7 +40,7 @@
testImplementation(libs.testExtJunit)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation(libs.kotlinCoroutinesTest)
diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
index e674f69..88a3769 100644
--- a/paging/paging-common/build.gradle
+++ b/paging/paging-common/build.gradle
@@ -38,10 +38,8 @@
api(libs.kotlinCoroutinesCore)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin, {
- exclude group: "org.mockito" // to keep control on the mockito version
- })
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(project(":internal-testutils-common"))
testImplementation(project(":internal-testutils-ktx"))
testImplementation(project(":internal-testutils-paging"))
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/ContiguousPagedListTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/ContiguousPagedListTest.kt
index 5e5857f..1a4637b 100644
--- a/paging/paging-common/src/test/kotlin/androidx/paging/ContiguousPagedListTest.kt
+++ b/paging/paging-common/src/test/kotlin/androidx/paging/ContiguousPagedListTest.kt
@@ -29,11 +29,10 @@
import androidx.paging.PagedList.Config
import androidx.paging.PagingSource.LoadResult.Page
import androidx.testutils.TestDispatcher
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.reset
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Assert.assertSame
@@ -329,7 +328,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(0, 40, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(35)
drain()
@@ -345,7 +344,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(0, 40, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(35)
// return a LoadResult.Invalid
@@ -369,7 +368,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(60, 40, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(if (placeholdersEnabled) 65 else 5)
drain()
@@ -385,7 +384,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(60, 40, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(if (placeholdersEnabled) 65 else 5)
// return a LoadResult.Invalid
@@ -409,7 +408,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(20, 40, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(if (placeholdersEnabled) 55 else 35)
drain()
@@ -496,7 +495,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(0, 20, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
// load 2nd page
pagedList.loadAround(19)
@@ -533,7 +532,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(80, 20, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
// load 4th page
pagedList.loadAround(if (placeholdersEnabled) 80 else 0)
@@ -586,7 +585,7 @@
// but before page received, access near end of list
pagedList.loadAround(if (placeholdersEnabled) 3 else 2)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
mainThread.executeAll()
// and the load at the beginning is dropped without signaling callback
verifyNoMoreInteractions(callback)
@@ -628,7 +627,7 @@
// but before page received, access near front of list
pagedList.loadAround(if (placeholdersEnabled) 1 else 0)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
mainThread.executeAll()
// and the load at the end is dropped without signaling callback
verifyNoMoreInteractions(callback)
@@ -878,7 +877,7 @@
val callback = mock<Callback>()
pagedList.addWeakCallback(callback)
verifyRange(0, 10, pagedList)
- verifyZeroInteractions(callback)
+ verifyNoMoreInteractions(callback)
pagedList.loadAround(5)
drain()
@@ -1060,9 +1059,9 @@
verifyRange(80, 20, pagedList)
// nothing yet
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
drain()
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
// loading around last item causes onItemAtEndLoaded
pagedList.loadAround(if (placeholdersEnabled) 99 else 19)
@@ -1075,7 +1074,7 @@
pagedList.loadAround(if (placeholdersEnabled) 80 else 0)
drain()
verifyRange(60, 40, pagedList)
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
// ...load rest of data, still no dispatch...
pagedList.loadAround(if (placeholdersEnabled) 60 else 0)
@@ -1085,7 +1084,7 @@
pagedList.loadAround(if (placeholdersEnabled) 20 else 0)
drain()
verifyRange(0, 100, pagedList)
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
// ... finally try prepend, see 0 items, which will dispatch front callback
pagedList.loadAround(0)
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/ItemKeyedDataSourceTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/ItemKeyedDataSourceTest.kt
index 13182ab..7af01a1 100644
--- a/paging/paging-common/src/test/kotlin/androidx/paging/ItemKeyedDataSourceTest.kt
+++ b/paging/paging-common/src/test/kotlin/androidx/paging/ItemKeyedDataSourceTest.kt
@@ -17,8 +17,8 @@
package androidx.paging
import androidx.paging.PagingSource.LoadResult.Page.Companion.COUNT_UNDEFINED
-import com.nhaarman.mockitokotlin2.capture
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.capture
+import org.mockito.kotlin.mock
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/PageKeyedDataSourceTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/PageKeyedDataSourceTest.kt
index fecb3e1..8c62bec 100644
--- a/paging/paging-common/src/test/kotlin/androidx/paging/PageKeyedDataSourceTest.kt
+++ b/paging/paging-common/src/test/kotlin/androidx/paging/PageKeyedDataSourceTest.kt
@@ -31,7 +31,6 @@
import org.mockito.Mockito.mock
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import kotlin.coroutines.EmptyCoroutineContext
import kotlin.test.assertFailsWith
@@ -258,7 +257,7 @@
pagedList.loadAround(0)
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
dispatcher.executeAll()
@@ -311,7 +310,7 @@
pagedList.loadAround(0)
- verifyZeroInteractions(boundaryCallback)
+ verifyNoMoreInteractions(boundaryCallback)
dispatcher.executeAll()
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index d1a017d..991478a 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -31,7 +31,7 @@
androidTestImplementation(libs.kotlinCoroutinesAndroid)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.kotlinStdlib)
lintPublish(project(":recyclerview:recyclerview-lint"))
}
diff --git a/recyclerview/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java b/recyclerview/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
index 5766fc8..99800ba 100644
--- a/recyclerview/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
+++ b/recyclerview/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
@@ -18,14 +18,12 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.Mockito;
-
@SuppressWarnings("unchecked")
@RunWith(JUnit4.class)
public class SortedListBatchedCallbackTest {
@@ -41,7 +39,7 @@
@Test
public void onChange() {
mBatchedCallback.onChanged(1, 2);
- verifyZeroInteractions(mMockCallback);
+ verifyNoMoreInteractions(mMockCallback);
mBatchedCallback.dispatchLastEvent();
verify(mMockCallback).onChanged(1, 2, null);
verifyNoMoreInteractions(mMockCallback);
@@ -51,7 +49,7 @@
public void onChangeWithPayload() {
final Object payload = 7;
mBatchedCallback.onChanged(1, 2, payload);
- verifyZeroInteractions(mMockCallback);
+ verifyNoMoreInteractions(mMockCallback);
mBatchedCallback.dispatchLastEvent();
verify(mMockCallback).onChanged(1, 2, payload);
verifyNoMoreInteractions(mMockCallback);
@@ -60,7 +58,7 @@
@Test
public void onRemoved() {
mBatchedCallback.onRemoved(2, 3);
- verifyZeroInteractions(mMockCallback);
+ verifyNoMoreInteractions(mMockCallback);
mBatchedCallback.dispatchLastEvent();
verify(mMockCallback).onRemoved(2, 3);
verifyNoMoreInteractions(mMockCallback);
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 35f2d71..bc91f86 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -122,7 +122,7 @@
androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-runtime-testing"))
androidTestImplementation(libs.rxjava2)
androidTestImplementation(libs.kotlinCoroutinesTest)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
// KSP does not support argument per flavor so we set schema location globally, for other per
diff --git a/room/room-common/build.gradle b/room/room-common/build.gradle
index da2c1c9..64092d5 100644
--- a/room/room-common/build.gradle
+++ b/room/room-common/build.gradle
@@ -32,7 +32,7 @@
api("androidx.annotation:annotation:1.3.0")
api(libs.kotlinStdlibJdk8)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.guava)
testImplementation(libs.truth)
}
diff --git a/room/room-compiler/build.gradle b/room/room-compiler/build.gradle
index 9a343d5..15f305c 100644
--- a/room/room-compiler/build.gradle
+++ b/room/room-compiler/build.gradle
@@ -110,7 +110,7 @@
testImplementation(project(":room:room-compiler-processing-testing"))
testImplementation(libs.junit)
testImplementation(libs.jsr250)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.antlr4)
testImplementation(libs.kotlinCompilerEmbeddable)
testImplementation(fileTree(
diff --git a/room/room-ktx/build.gradle b/room/room-ktx/build.gradle
index 1b1eec4..d824294d 100644
--- a/room/room-ktx/build.gradle
+++ b/room/room-ktx/build.gradle
@@ -29,7 +29,7 @@
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesAndroid)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
testImplementation(libs.testRunner)
diff --git a/room/room-migration/build.gradle b/room/room-migration/build.gradle
index d9f13b9..6fa47eaf 100644
--- a/room/room-migration/build.gradle
+++ b/room/room-migration/build.gradle
@@ -34,7 +34,7 @@
implementation(libs.gson)
testImplementation(libs.junit)
testImplementation(libs.intellijAnnotations)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/room/room-runtime/build.gradle b/room/room-runtime/build.gradle
index 8eb962e..c9153f0 100644
--- a/room/room-runtime/build.gradle
+++ b/room/room-runtime/build.gradle
@@ -48,7 +48,7 @@
testImplementation("androidx.arch.core:core-testing:2.0.1")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.mockitoKotlin4)
testImplementation("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
testImplementation(libs.kotlinStdlib)
diff --git a/room/room-rxjava2/build.gradle b/room/room-rxjava2/build.gradle
index a3653c8..ed6314b 100644
--- a/room/room-rxjava2/build.gradle
+++ b/room/room-rxjava2/build.gradle
@@ -32,7 +32,7 @@
testImplementation(libs.truth)
testImplementation(libs.kotlinTest)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.mockitoKotlin4)
testImplementation("androidx.arch.core:core-testing:2.0.1")
testImplementation("androidx.lifecycle:lifecycle-livedata:2.0.0") // for mocking invalidation tracker
diff --git a/room/room-rxjava3/build.gradle b/room/room-rxjava3/build.gradle
index 32f1a35..48b85ff 100644
--- a/room/room-rxjava3/build.gradle
+++ b/room/room-rxjava3/build.gradle
@@ -33,7 +33,7 @@
testImplementation(libs.truth)
testImplementation(libs.kotlinTest)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.mockitoKotlin4)
testImplementation("androidx.arch.core:core-testing:2.0.1")
testImplementation("androidx.lifecycle:lifecycle-livedata:2.0.0") // for mocking invalidation tracker
diff --git a/security/security-app-authenticator/build.gradle b/security/security-app-authenticator/build.gradle
index 21f835c..730607e 100644
--- a/security/security-app-authenticator/build.gradle
+++ b/security/security-app-authenticator/build.gradle
@@ -32,7 +32,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
androidTestImplementation(libs.junit)
diff --git a/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppAuthenticatorTest.java b/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppAuthenticatorTest.java
index c95b3c8..cd3ad3e 100644
--- a/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppAuthenticatorTest.java
+++ b/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppAuthenticatorTest.java
@@ -53,6 +53,7 @@
@Mock
private AppSignatureVerifier mMockAppSignatureVerifier;
+ @SuppressWarnings("deprecation") // b/251210952
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
diff --git a/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppSignatureVerifierTest.java b/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppSignatureVerifierTest.java
index 31a1e90..3219ae9 100644
--- a/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppSignatureVerifierTest.java
+++ b/security/security-app-authenticator/src/test/java/androidx/security/app/authenticator/AppSignatureVerifierTest.java
@@ -76,6 +76,7 @@
private AppSignatureVerifierTestBuilder mBuilder;
+ @SuppressWarnings("deprecation") // b/251210952
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle
index f4e7351..32c89ad 100644
--- a/sqlite/sqlite-ktx/build.gradle
+++ b/sqlite/sqlite-ktx/build.gradle
@@ -27,7 +27,7 @@
api(libs.kotlinStdlib)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle
index 8576750..47256e3 100644
--- a/sqlite/sqlite/build.gradle
+++ b/sqlite/sqlite/build.gradle
@@ -26,7 +26,7 @@
api("androidx.annotation:annotation:1.0.0")
implementation(libs.kotlinStdlib)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.kotlinTest)
testImplementation(libs.truth)
}
diff --git a/testutils/testutils-navigation/build.gradle b/testutils/testutils-navigation/build.gradle
index a76c992..b4e0204 100644
--- a/testutils/testutils-navigation/build.gradle
+++ b/testutils/testutils-navigation/build.gradle
@@ -29,7 +29,7 @@
testImplementation(projectOrArtifact(":navigation:navigation-testing"))
testImplementation("androidx.arch.core:core-testing:2.1.0")
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.kotlinCoroutinesTest)
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index a7156b4c..55ad39a 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -41,7 +41,7 @@
androidTestImplementation(libs.protobuf)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.testExtJunit)
testImplementation(libs.testExtTruth)
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index bd54c58..33e7c27 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -62,8 +62,8 @@
testImplementation(libs.testRules)
testImplementation(libs.kotlinCoroutinesTest)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.truth)
}
diff --git a/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/checkers/TimelineCheckerTest.kt b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/checkers/TimelineCheckerTest.kt
index 7389c34..2886608 100644
--- a/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/checkers/TimelineCheckerTest.kt
+++ b/wear/tiles/tiles-renderer/src/test/java/androidx/wear/tiles/checkers/TimelineCheckerTest.kt
@@ -20,13 +20,13 @@
import androidx.wear.tiles.TilesTestRunner
import androidx.wear.tiles.TimelineBuilders
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.doThrow
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index f316baf..b7df1ba 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -38,7 +38,7 @@
testImplementation(libs.testRules)
testImplementation("androidx.concurrent:concurrent-futures:1.1.0")
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
android {
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle
index a773575..48e14cb 100644
--- a/wear/watchface/watchface-client/build.gradle
+++ b/wear/watchface/watchface-client/build.gradle
@@ -41,8 +41,8 @@
androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(libs.truth)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.robolectric)
testImplementation(libs.testCore)
testImplementation(libs.testExtJunit)
diff --git a/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/InteractiveWatchFaceClientTest.kt b/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/InteractiveWatchFaceClientTest.kt
index 8a468f0..931ae1f 100644
--- a/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/InteractiveWatchFaceClientTest.kt
+++ b/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/InteractiveWatchFaceClientTest.kt
@@ -18,10 +18,10 @@
import android.os.IBinder
import androidx.wear.watchface.control.IInteractiveWatchFace
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.`when`
diff --git a/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/WatchFaceMetadataClientTest.kt b/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/WatchFaceMetadataClientTest.kt
index bd75cf4..43ff4bc 100644
--- a/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/WatchFaceMetadataClientTest.kt
+++ b/wear/watchface/watchface-client/src/test/java/androidx/wear/watchface/client/WatchFaceMetadataClientTest.kt
@@ -28,10 +28,10 @@
import androidx.wear.watchface.control.IWatchFaceControlService
import androidx.wear.watchface.data.ComplicationSlotMetadataWireFormat
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.any
+import org.mockito.kotlin.any
import org.junit.Test
import org.junit.runner.RunWith
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.mockito.Mockito.`when`
@RunWith(ClientTestRunner::class)
diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle
index 5da3571..a60100a 100644
--- a/wear/watchface/watchface-complications-data-source/build.gradle
+++ b/wear/watchface/watchface-complications-data-source/build.gradle
@@ -33,7 +33,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.junit)
}
diff --git a/wear/watchface/watchface-complications-data-source/src/test/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceServiceTest.java b/wear/watchface/watchface-complications-data-source/src/test/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceServiceTest.java
index 0857efc..cc84470 100644
--- a/wear/watchface/watchface-complications-data-source/src/test/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceServiceTest.java
+++ b/wear/watchface/watchface-complications-data-source/src/test/java/androidx/wear/watchface/complications/datasource/ComplicationDataSourceServiceTest.java
@@ -251,6 +251,7 @@
}
};
+ @SuppressWarnings("deprecation") // b/251211092
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/wear/watchface/watchface-complications-data/build.gradle b/wear/watchface/watchface-complications-data/build.gradle
index 52572f0..c574d08 100644
--- a/wear/watchface/watchface-complications-data/build.gradle
+++ b/wear/watchface/watchface-complications-data/build.gradle
@@ -38,7 +38,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.junit)
diff --git a/wear/watchface/watchface-complications-rendering/build.gradle b/wear/watchface/watchface-complications-rendering/build.gradle
index e80cb79..1f3f0cc 100644
--- a/wear/watchface/watchface-complications-rendering/build.gradle
+++ b/wear/watchface/watchface-complications-rendering/build.gradle
@@ -39,7 +39,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(project(":wear:watchface:watchface"))
diff --git a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
index 7ca4cc4..a019e7b 100644
--- a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
+++ b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationDrawableTest.java
@@ -100,6 +100,7 @@
@Mock
Drawable.Callback mMockDrawableCallback;
+ @SuppressWarnings("deprecation") // b/251211092
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationRendererTest.java b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationRendererTest.java
index 654f80f..72795cd 100644
--- a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationRendererTest.java
+++ b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/ComplicationRendererTest.java
@@ -30,7 +30,7 @@
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -107,6 +107,7 @@
private OnInvalidateListener mMockInvalidateListener;
private final Resources mResurces = ApplicationProvider.getApplicationContext().getResources();
+ @SuppressWarnings("deprecation") // b/251211092
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -334,7 +335,7 @@
// AND complication is drawn again
mComplicationRenderer.draw(mMockCanvas, REFERENCE_TIME, false, false, false, false);
// THEN nothing is drawn on canvas
- verifyZeroInteractions(mMockCanvas);
+ verifyNoMoreInteractions(mMockCanvas);
}
@Test
@@ -351,7 +352,7 @@
mComplicationRenderer.draw(mMockCanvas, REFERENCE_TIME, false, false, false, false);
// THEN nothing is drawn on canvas
- verifyZeroInteractions(mMockCanvas);
+ verifyNoMoreInteractions(mMockCanvas);
}
@Test
diff --git a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/RoundedDrawableTest.java b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/RoundedDrawableTest.java
index ca40577..ac2c452 100644
--- a/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/RoundedDrawableTest.java
+++ b/wear/watchface/watchface-complications-rendering/src/test/java/androidx/wear/watchface/complications/rendering/RoundedDrawableTest.java
@@ -52,6 +52,7 @@
@Mock Canvas mMockCanvas;
+ @SuppressWarnings("deprecation") // b/251211092
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/wear/watchface/watchface-complications/build.gradle b/wear/watchface/watchface-complications/build.gradle
index ca48143..6d6f514 100644
--- a/wear/watchface/watchface-complications/build.gradle
+++ b/wear/watchface/watchface-complications/build.gradle
@@ -34,7 +34,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(libs.kotlinReflect)
diff --git a/wear/watchface/watchface-style/build.gradle b/wear/watchface/watchface-style/build.gradle
index 36c56da..9d0ba2c 100644
--- a/wear/watchface/watchface-style/build.gradle
+++ b/wear/watchface/watchface-style/build.gradle
@@ -34,7 +34,7 @@
testImplementation(libs.testCore)
testImplementation(libs.testRules)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation(libs.kotlinTest)
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index 8afd648..d59f829 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -50,8 +50,8 @@
testImplementation(libs.testExtJunit)
testImplementation(libs.testCore)
testImplementation(libs.testRules)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.robolectric)
testImplementation(libs.truth)
testImplementation(libs.kotlinTest)
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
index a75123a..7db3ef4 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt
@@ -41,10 +41,6 @@
import androidx.test.filters.MediumTest
import androidx.test.screenshot.AndroidXScreenshotTestRule
import androidx.test.screenshot.assertAgainstGolden
-import androidx.wear.watchface.complications.SystemDataSources
-import androidx.wear.watchface.complications.data.ComplicationText
-import androidx.wear.watchface.complications.data.PlainComplicationText
-import androidx.wear.watchface.complications.data.ShortTextComplicationData
import androidx.wear.watchface.ComplicationSlotsManager
import androidx.wear.watchface.DrawMode
import androidx.wear.watchface.MutableWatchState
@@ -55,10 +51,14 @@
import androidx.wear.watchface.WatchFace
import androidx.wear.watchface.WatchFaceService
import androidx.wear.watchface.WatchState
+import androidx.wear.watchface.complications.SystemDataSources
+import androidx.wear.watchface.complications.data.ComplicationText
import androidx.wear.watchface.complications.data.LongTextComplicationData
import androidx.wear.watchface.complications.data.MonochromaticImage
import androidx.wear.watchface.complications.data.NoDataComplicationData
+import androidx.wear.watchface.complications.data.PlainComplicationText
import androidx.wear.watchface.complications.data.RangedValueComplicationData
+import androidx.wear.watchface.complications.data.ShortTextComplicationData
import androidx.wear.watchface.complications.data.SmallImage
import androidx.wear.watchface.complications.data.SmallImageType
import androidx.wear.watchface.control.IInteractiveWatchFace
@@ -79,7 +79,14 @@
import androidx.wear.watchface.style.WatchFaceLayer
import androidx.wear.watchface.style.data.UserStyleWireFormat
import com.google.common.truth.Truth.assertThat
+import java.time.Instant
+import java.time.ZoneId
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.android.asCoroutineDispatcher
+import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.junit.After
import org.junit.Assert.fail
@@ -91,13 +98,6 @@
import org.mockito.Mock
import org.mockito.Mockito
import org.mockito.MockitoAnnotations
-import java.time.Instant
-import java.time.ZoneId
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.android.asCoroutineDispatcher
-import kotlinx.coroutines.launch
private const val BITMAP_WIDTH = 400
private const val BITMAP_HEIGHT = 400
@@ -270,6 +270,7 @@
private lateinit var engineWrapper: WatchFaceService.EngineWrapper
private lateinit var interactiveWatchFaceInstance: IInteractiveWatchFace
+ @Suppress("DEPRECATION") // b/251211092
@Before
public fun setUp() {
Assume.assumeTrue("This test suite assumes API 27", Build.VERSION.SDK_INT >= 27)
diff --git a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/XmlDefinedUserStyleSchemaAndComplicationSlotsTest.kt b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/XmlDefinedUserStyleSchemaAndComplicationSlotsTest.kt
index 8919290..6368e9d 100644
--- a/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/XmlDefinedUserStyleSchemaAndComplicationSlotsTest.kt
+++ b/wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/XmlDefinedUserStyleSchemaAndComplicationSlotsTest.kt
@@ -169,6 +169,7 @@
private var initLatch = CountDownLatch(1)
private lateinit var interactiveWatchFaceInstance: IInteractiveWatchFace
+ @Suppress("DEPRECATION") // b/251211092
@Before
public fun setUp() {
Assume.assumeTrue("This test suite assumes API 29", Build.VERSION.SDK_INT >= 29)
diff --git a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
index d3ef0be7..d727951 100644
--- a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
+++ b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/AsyncWatchFaceInitTest.kt
@@ -35,7 +35,7 @@
import androidx.wear.watchface.style.CurrentUserStyleRepository
import androidx.wear.watchface.style.UserStyleSchema
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.launch
diff --git a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
index 024b835..49c2fb5 100644
--- a/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
+++ b/wear/watchface/watchface/src/test/java/androidx/wear/watchface/WatchFaceServiceTest.kt
@@ -90,9 +90,9 @@
import androidx.wear.watchface.style.WatchFaceLayer
import androidx.wear.watchface.style.data.UserStyleWireFormat
import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.eq
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verifyNoMoreInteractions
import java.io.StringWriter
import java.nio.ByteBuffer
import java.time.Instant
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle
index d55712d..3338f9b 100644
--- a/wear/wear-input/build.gradle
+++ b/wear/wear-input/build.gradle
@@ -31,7 +31,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
testImplementation(project(":wear:wear-input-testing"))
compileOnly(fileTree(dir: "../wear_stubs", include: ["com.google.android.wearable-stubs.jar"]))
diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle
index 8bfb4bc..70b1fa7 100644
--- a/wear/wear-phone-interactions/build.gradle
+++ b/wear/wear-phone-interactions/build.gradle
@@ -34,8 +34,7 @@
testImplementation(libs.testRunner)
testImplementation(libs.testRules)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
testImplementation(libs.truth)
}
diff --git a/wear/wear-phone-interactions/src/test/java/androidx/wear/phone/interactions/PhoneTypeHelperTest.kt b/wear/wear-phone-interactions/src/test/java/androidx/wear/phone/interactions/PhoneTypeHelperTest.kt
index 093ca7c..4afca04 100644
--- a/wear/wear-phone-interactions/src/test/java/androidx/wear/phone/interactions/PhoneTypeHelperTest.kt
+++ b/wear/wear-phone-interactions/src/test/java/androidx/wear/phone/interactions/PhoneTypeHelperTest.kt
@@ -47,6 +47,7 @@
var mockContentProvider: ContentProvider? = null
private var contentResolver: ContentResolver? = null
+ @Suppress("DEPRECATION") // b/251211092
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle
index 6b92f7e..d7fb72e 100644
--- a/wear/wear-remote-interactions/build.gradle
+++ b/wear/wear-remote-interactions/build.gradle
@@ -41,8 +41,8 @@
testImplementation(libs.testRules)
testImplementation(libs.testRunner)
testImplementation(libs.robolectric)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
implementation("androidx.annotation:annotation:1.2.0")
implementation(libs.playServicesBasement)
diff --git a/wear/wear-remote-interactions/src/test/java/androidx/wear/remote/interactions/RemoteActivityHelperTest.kt b/wear/wear-remote-interactions/src/test/java/androidx/wear/remote/interactions/RemoteActivityHelperTest.kt
index 944bf9a..b5c09d4 100644
--- a/wear/wear-remote-interactions/src/test/java/androidx/wear/remote/interactions/RemoteActivityHelperTest.kt
+++ b/wear/wear-remote-interactions/src/test/java/androidx/wear/remote/interactions/RemoteActivityHelperTest.kt
@@ -36,7 +36,7 @@
import com.google.android.gms.tasks.Tasks
import com.google.android.gms.wearable.Node
import com.google.android.gms.wearable.NodeClient
-import com.nhaarman.mockitokotlin2.mock
+import org.mockito.kotlin.mock
import org.junit.Assert.assertEquals
import org.junit.Assert.assertThrows
import org.junit.Assert.assertTrue
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle
index 401ee9b..f055c6f 100644
--- a/wear/wear/build.gradle
+++ b/wear/wear/build.gradle
@@ -31,8 +31,7 @@
testImplementation(libs.robolectric)
testImplementation(libs.testExtJunit)
testImplementation(libs.testRules)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
implementation("androidx.core:core-ktx:1.6.0")
diff --git a/wear/wear/src/test/java/androidx/wear/ambient/AmbientDelegateTest.java b/wear/wear/src/test/java/androidx/wear/ambient/AmbientDelegateTest.java
index 1ca8721..ec8ade8 100644
--- a/wear/wear/src/test/java/androidx/wear/ambient/AmbientDelegateTest.java
+++ b/wear/wear/src/test/java/androidx/wear/ambient/AmbientDelegateTest.java
@@ -18,7 +18,7 @@
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import androidx.fragment.app.FragmentActivity;
@@ -66,7 +66,7 @@
public void testNullActivity() {
mAmbientDelegateUnderTest = new AmbientDelegate(null,
mMockWearableControllerProvider, mMockAmbientCallback);
- verifyZeroInteractions(mMockWearableControllerProvider);
+ verifyNoMoreInteractions(mMockWearableControllerProvider);
assertFalse(mAmbientDelegateUnderTest.isAmbient());
diff --git a/wear/wear/src/test/java/androidx/wear/utils/WearTypeHelperTest.java b/wear/wear/src/test/java/androidx/wear/utils/WearTypeHelperTest.java
index cf0c654..f3a455a 100644
--- a/wear/wear/src/test/java/androidx/wear/utils/WearTypeHelperTest.java
+++ b/wear/wear/src/test/java/androidx/wear/utils/WearTypeHelperTest.java
@@ -38,6 +38,7 @@
private ShadowPackageManager mShadowPackageManager = null;
private Context mContext;
+ @SuppressWarnings("deprecation") // b/251211092
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle
index eb27a1f..5390e0c 100644
--- a/window/window-java/build.gradle
+++ b/window/window-java/build.gradle
@@ -33,8 +33,8 @@
testImplementation(libs.testCore)
testImplementation(libs.testRunner)
testImplementation(libs.junit)
- testImplementation(libs.mockitoCore)
- testImplementation(libs.mockitoKotlin)
+ testImplementation(libs.mockitoCore4)
+ testImplementation(libs.mockitoKotlin4)
testImplementation(libs.kotlinCoroutinesTest)
androidTestImplementation(libs.testExtJunit)
diff --git a/window/window-java/src/test/java/androidx/window/java/layout/WindowInfoTrackerCallbackAdapterTest.kt b/window/window-java/src/test/java/androidx/window/java/layout/WindowInfoTrackerCallbackAdapterTest.kt
index da19ea4..639e073 100644
--- a/window/window-java/src/test/java/androidx/window/java/layout/WindowInfoTrackerCallbackAdapterTest.kt
+++ b/window/window-java/src/test/java/androidx/window/java/layout/WindowInfoTrackerCallbackAdapterTest.kt
@@ -19,11 +19,11 @@
import androidx.core.util.Consumer
import androidx.window.layout.WindowInfoTracker
import androidx.window.layout.WindowLayoutInfo
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.whenever
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.runBlocking
import org.junit.Test
diff --git a/work/work-rxjava2/build.gradle b/work/work-rxjava2/build.gradle
index 575800f..4e66b7a 100644
--- a/work/work-rxjava2/build.gradle
+++ b/work/work-rxjava2/build.gradle
@@ -28,7 +28,7 @@
testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(libs.kotlinStdlib)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
diff --git a/work/work-rxjava3/build.gradle b/work/work-rxjava3/build.gradle
index 4894866..2996856 100644
--- a/work/work-rxjava3/build.gradle
+++ b/work/work-rxjava3/build.gradle
@@ -28,7 +28,7 @@
testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(libs.kotlinStdlib)
- testImplementation(libs.mockitoCore)
+ testImplementation(libs.mockitoCore4)
}
androidx {
