Adopt updated mockito

Test: this is a test change
Bug: none
Change-Id: I02596eb660fdd710a5434b2e501037f3f750a268

5 files changed, 15 insertions, 15 deletions

diff --git a/compilationTests/BUILD.bazel b/compilationTests/BUILD.bazel
index 78ac5139..1cfbced6 100644
--- a/compilationTests/BUILD.bazel
+++ b/compilationTests/BUILD.bazel
@@ -140,6 +140,6 @@ maven_repository(
         "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.4.32",
         "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.4.31",
         "@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.5.21",
-        "@maven//:org.mockito.mockito-core_3.12.4",
+        "@maven//:org.mockito.mockito-core_4.8.0",
     ],
 )
diff --git a/integration-tests-support/TestApp/app/build.gradle b/integration-tests-support/TestApp/app/build.gradle
index c410b2b5..e84cf29b 100644
--- a/integration-tests-support/TestApp/app/build.gradle
+++ b/integration-tests-support/TestApp/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.mockito:mockito-core:3.12.4"
+    androidTestImplementation "org.mockito:mockito-core:4.8.0"
 }
 
 gradle.projectsEvaluated {
diff --git a/integration-tests-support/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java b/integration-tests-support/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
index 87e2281a..af8a955d 100644
--- a/integration-tests-support/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
+++ b/integration-tests-support/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
@@ -36,13 +36,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(AndroidJUnit4.class)
@@ -70,7 +70,7 @@ public class CallbackTest {
         mBindingRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                verifyZeroInteractions(mObj);
+                verifyNoInteractions(mObj);
             }
         });
 
@@ -151,7 +151,7 @@ public class CallbackTest {
 
             }
         });
-        verifyZeroInteractions(mObj);
+        verifyNoInteractions(mObj);
     }
 
     // long click
@@ -285,12 +285,12 @@ public class CallbackTest {
         mBindingRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                verifyZeroInteractions(objects);
+                verifyNoInteractions(objects);
                 mBinding.view7.performClick();
                 verify(objects[1]).onClick(mBinding.view7);
                 mBinding.view7.performLongClick();
                 verify(objects[2]).onLongClick(mBinding.view7);
-                verifyZeroInteractions(objects[0]);
+                verifyNoInteractions(objects[0]);
             }
         });
     }
diff --git a/integration-tests/TestApp/app/build.gradle b/integration-tests/TestApp/app/build.gradle
index 3171b4d3..c5578c91 100644
--- a/integration-tests/TestApp/app/build.gradle
+++ b/integration-tests/TestApp/app/build.gradle
@@ -47,7 +47,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation "org.mockito:mockito-core:3.12.4"
+    androidTestImplementation "org.mockito:mockito-core:4.8.0"
 }
 
 gradle.projectsEvaluated {
diff --git a/integration-tests/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java b/integration-tests/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
index d25999d0..20687c35 100644
--- a/integration-tests/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
+++ b/integration-tests/TestApp/app/src/androidTest/java/android/databinding/testapp/CallbackTest.java
@@ -36,13 +36,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(AndroidJUnit4.class)
@@ -70,7 +70,7 @@ public class CallbackTest {
         mBindingRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                verifyZeroInteractions(mObj);
+                verifyNoInteractions(mObj);
             }
         });
 
@@ -151,7 +151,7 @@ public class CallbackTest {
 
             }
         });
-        verifyZeroInteractions(mObj);
+        verifyNoInteractions(mObj);
     }
 
     // long click
@@ -285,12 +285,12 @@ public class CallbackTest {
         mBindingRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                verifyZeroInteractions(objects);
+                verifyNoInteractions(objects);
                 mBinding.view7.performClick();
                 verify(objects[1]).onClick(mBinding.view7);
                 mBinding.view7.performLongClick();
                 verify(objects[2]).onLongClick(mBinding.view7);
-                verifyZeroInteractions(objects[0]);
+                verifyNoInteractions(objects[0]);
             }
         });
     }