From 71b38356b1486099de7c2a9fab0345088b3e7b1e Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Tue, 16 Nov 2021 11:11:53 -0800
Subject: [PATCH] Update to Mockito 4.0.0

---
 pom.xml                                                     | 2 +-
 .../textsecuregcm/controllers/ChallengeControllerTest.java  | 6 +++---
 .../textsecuregcm/storage/ReportMessageManagerTest.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 123677a74..7bd9aca6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <libphonenumber.version>8.12.33</libphonenumber.version>
     <logstash.logback.version>6.6</logstash.logback.version>
     <micrometer.version>1.5.3</micrometer.version>
-    <mockito.version>3.11.1</mockito.version>
+    <mockito.version>4.0.0</mockito.version>
     <netty.version>4.1.65.Final</netty.version>
     <netty.tcnative-boringssl-static.version>2.0.39.Final</netty.tcnative-boringssl-static.version>
     <opentest4j.version>1.2.0</opentest4j.version>
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java
index d135c2131..066ed832b 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java
@@ -11,7 +11,7 @@ import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider;
 import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
@@ -142,7 +142,7 @@ class ChallengeControllerTest {
         .put(Entity.json(recaptchaChallengeJson));
 
     assertEquals(400, response.getStatus());
-    verifyZeroInteractions(rateLimitChallengeManager);
+    verifyNoInteractions(rateLimitChallengeManager);
   }
 
   @Test
@@ -159,7 +159,7 @@ class ChallengeControllerTest {
 
     assertEquals(400, response.getStatus());
 
-    verifyZeroInteractions(rateLimitChallengeManager);
+    verifyNoInteractions(rateLimitChallengeManager);
   }
 
   @Test
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
index 5e3994e7f..44ed907b8 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
@@ -6,7 +6,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import io.micrometer.core.instrument.Counter;
@@ -33,7 +33,7 @@ class ReportMessageManagerTest {
 
     assertDoesNotThrow(() -> reportMessageManager.store(null, messageGuid));
 
-    verifyZeroInteractions(reportMessageDynamoDb);
+    verifyNoInteractions(reportMessageDynamoDb);
 
     reportMessageManager.store(number, messageGuid);