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

Use `assertTimeoutPreemptively` instead of `assertTimeout`

This commit is contained in:
Chris Eager 2021-11-30 15:30:46 -08:00 committed by Jon Chambers
parent c5f261305d
commit 4d2403d619
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTimeout; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ -101,7 +101,7 @@ class MessagePersisterIntegrationTest {
final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(messageCount); final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(messageCount);
final Instant now = Instant.now(); final Instant now = Instant.now();
assertTimeout(Duration.ofSeconds(15), () -> { assertTimeoutPreemptively(Duration.ofSeconds(15), () -> {
for (int i = 0; i < messageCount; i++) { for (int i = 0; i < messageCount; i++) {
final UUID messageGuid = UUID.randomUUID(); final UUID messageGuid = UUID.randomUUID();

6
service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java
View File

@ -6,7 +6,7 @@
package org.whispersystems.textsecuregcm.websocket; package org.whispersystems.textsecuregcm.websocket;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTimeout; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@ -122,7 +122,7 @@ class WebSocketConnectionIntegrationTest {
final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(persistedMessageCount + cachedMessageCount); final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(persistedMessageCount + cachedMessageCount);
assertTimeout(Duration.ofSeconds(15), () -> { assertTimeoutPreemptively(Duration.ofSeconds(15), () -> {
{ {
final List<MessageProtos.Envelope> persistedMessages = new ArrayList<>(persistedMessageCount); final List<MessageProtos.Envelope> persistedMessages = new ArrayList<>(persistedMessageCount);
@ -200,7 +200,7 @@ class WebSocketConnectionIntegrationTest {
final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(persistedMessageCount + cachedMessageCount); final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(persistedMessageCount + cachedMessageCount);
assertTimeout(Duration.ofSeconds(15), () -> { assertTimeoutPreemptively(Duration.ofSeconds(15), () -> {
{ {
final List<MessageProtos.Envelope> persistedMessages = new ArrayList<>(persistedMessageCount); final List<MessageProtos.Envelope> persistedMessages = new ArrayList<>(persistedMessageCount);