MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Mockito 4.0.0

This commit is contained in:
Chris Eager 2021-11-16 11:11:53 -08:00 committed by Chris Eager
parent 5a99708f56
commit 71b38356b1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -44,7 +44,7 @@
<libphonenumber.version>8.12.33</libphonenumber.version> <libphonenumber.version>8.12.33</libphonenumber.version>
<logstash.logback.version>6.6</logstash.logback.version> <logstash.logback.version>6.6</logstash.logback.version>
<micrometer.version>1.5.3</micrometer.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.version>4.1.65.Final</netty.version>
<netty.tcnative-boringssl-static.version>2.0.39.Final</netty.tcnative-boringssl-static.version> <netty.tcnative-boringssl-static.version>2.0.39.Final</netty.tcnative-boringssl-static.version>
<opentest4j.version>1.2.0</opentest4j.version> <opentest4j.version>1.2.0</opentest4j.version>

6
service/src/test/java/org/whispersystems/textsecuregcm/controllers/ChallengeControllerTest.java
View File

@ -11,7 +11,7 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; 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.auth.PolymorphicAuthValueFactoryProvider;
import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
@ -142,7 +142,7 @@ class ChallengeControllerTest {
.put(Entity.json(recaptchaChallengeJson)); .put(Entity.json(recaptchaChallengeJson));
assertEquals(400, response.getStatus()); assertEquals(400, response.getStatus());
verifyZeroInteractions(rateLimitChallengeManager); verifyNoInteractions(rateLimitChallengeManager);
} }
@Test @Test
@ -159,7 +159,7 @@ class ChallengeControllerTest {
assertEquals(400, response.getStatus()); assertEquals(400, response.getStatus());
verifyZeroInteractions(rateLimitChallengeManager); verifyNoInteractions(rateLimitChallengeManager);
} }
@Test @Test

4
service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
View File

@ -6,7 +6,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; 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 static org.mockito.Mockito.when;
import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Counter;
@ -33,7 +33,7 @@ class ReportMessageManagerTest {
assertDoesNotThrow(() -> reportMessageManager.store(null, messageGuid)); assertDoesNotThrow(() -> reportMessageManager.store(null, messageGuid));
verifyZeroInteractions(reportMessageDynamoDb); verifyNoInteractions(reportMessageDynamoDb);
reportMessageManager.store(number, messageGuid); reportMessageManager.store(number, messageGuid);