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

Small test cleanup

This commit is contained in:
Chris Eager 2022-08-09 15:32:44 -05:00
parent 5275c27ee1
commit 65da844d70
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java
View File

@ -35,6 +35,7 @@ class MessageMetricsTest {
void setup() { void setup() {
when(account.getUuid()).thenReturn(aci); when(account.getUuid()).thenReturn(aci);
when(account.getPhoneNumberIdentifier()).thenReturn(pni); when(account.getPhoneNumberIdentifier()).thenReturn(pni);
Metrics.globalRegistry.clear();
simpleMeterRegistry = new SimpleMeterRegistry(); simpleMeterRegistry = new SimpleMeterRegistry();
Metrics.globalRegistry.add(simpleMeterRegistry); Metrics.globalRegistry.add(simpleMeterRegistry);
} }

40
service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java
View File

@ -144,9 +144,9 @@ class WebSocketConnectionTest {
UUID senderOneUuid = UUID.randomUUID(); UUID senderOneUuid = UUID.randomUUID();
UUID senderTwoUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID();
List<Envelope> outgoingMessages = List.of(createMessage("sender1", senderOneUuid, accountUuid, 1111, "first"), List<Envelope> outgoingMessages = List.of(createMessage(senderOneUuid, accountUuid, 1111, "first"),
createMessage("sender1", senderOneUuid, accountUuid, 2222, "second"), createMessage(senderOneUuid, accountUuid, 2222, "second"),
createMessage("sender2", senderTwoUuid, accountUuid, 3333, "third")); createMessage(senderTwoUuid, accountUuid, 3333, "third"));
final long deviceId = 2L; final long deviceId = 2L;
when(device.getId()).thenReturn(deviceId); when(device.getId()).thenReturn(deviceId);
@ -225,8 +225,8 @@ class WebSocketConnectionTest {
when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean())) when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean()))
.thenReturn(new Pair<>(Collections.emptyList(), false)) .thenReturn(new Pair<>(Collections.emptyList(), false))
.thenReturn(new Pair<>(List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 1111, "first")), false)) .thenReturn(new Pair<>(List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first")), false))
.thenReturn(new Pair<>(List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")), false)); .thenReturn(new Pair<>(List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second")), false));
final WebSocketResponseMessage successResponse = mock(WebSocketResponseMessage.class); final WebSocketResponseMessage successResponse = mock(WebSocketResponseMessage.class);
when(successResponse.getStatus()).thenReturn(200); when(successResponse.getStatus()).thenReturn(200);
@ -432,11 +432,11 @@ class WebSocketConnectionTest {
when(client.getUserAgent()).thenReturn("Test-UA"); when(client.getUserAgent()).thenReturn("Test-UA");
final List<Envelope> firstPageMessages = final List<Envelope> firstPageMessages =
List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first"),
createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second"));
final List<Envelope> secondPageMessages = final List<Envelope> secondPageMessages =
List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 3333, "third")); List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 3333, "third"));
when(messagesManager.getMessagesForDevice(account.getUuid(), 1L, client.getUserAgent(), false)) when(messagesManager.getMessagesForDevice(account.getUuid(), 1L, client.getUserAgent(), false))
.thenReturn(new Pair<>(firstPageMessages, true)) .thenReturn(new Pair<>(firstPageMessages, true))
@ -477,7 +477,7 @@ class WebSocketConnectionTest {
final UUID senderUuid = UUID.randomUUID(); final UUID senderUuid = UUID.randomUUID();
final List<Envelope> messages = List.of( final List<Envelope> messages = List.of(
createMessage("senderE164", senderUuid, UUID.randomUUID(), 1111L, "message the first")); createMessage(senderUuid, UUID.randomUUID(), 1111L, "message the first"));
when(messagesManager.getMessagesForDevice(account.getUuid(), 1L, client.getUserAgent(), false)) when(messagesManager.getMessagesForDevice(account.getUuid(), 1L, client.getUserAgent(), false))
.thenReturn(new Pair<>(messages, false)); .thenReturn(new Pair<>(messages, false));
@ -563,11 +563,11 @@ class WebSocketConnectionTest {
when(client.getUserAgent()).thenReturn("Test-UA"); when(client.getUserAgent()).thenReturn("Test-UA");
final List<Envelope> firstPageMessages = final List<Envelope> firstPageMessages =
List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first"),
createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second"));
final List<Envelope> secondPageMessages = final List<Envelope> secondPageMessages =
List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 3333, "third")); List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 3333, "third"));
when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean())) when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean()))
.thenReturn(new Pair<>(firstPageMessages, false)) .thenReturn(new Pair<>(firstPageMessages, false))
@ -670,10 +670,10 @@ class WebSocketConnectionTest {
UUID senderTwoUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID();
List<Envelope> outgoingMessages = List.of( List<Envelope> outgoingMessages = List.of(
createMessage("sender1", senderOneUuid, UUID.randomUUID(), 1111, "first"), createMessage(senderOneUuid, UUID.randomUUID(), 1111, "first"),
createMessage("sender1", senderOneUuid, UUID.randomUUID(), 2222, createMessage(senderOneUuid, UUID.randomUUID(), 2222,
RandomStringUtils.randomAlphanumeric(WebSocketConnection.MAX_DESKTOP_MESSAGE_SIZE + 1)), RandomStringUtils.randomAlphanumeric(WebSocketConnection.MAX_DESKTOP_MESSAGE_SIZE + 1)),
createMessage("sender2", senderTwoUuid, UUID.randomUUID(), 3333, "third")); createMessage(senderTwoUuid, UUID.randomUUID(), 3333, "third"));
when(device.getId()).thenReturn(2L); when(device.getId()).thenReturn(2L);
@ -736,14 +736,14 @@ class WebSocketConnectionTest {
void testSendOversizedMessagesForNonDesktop() { void testSendOversizedMessagesForNonDesktop() {
MessagesManager storedMessages = mock(MessagesManager.class); MessagesManager storedMessages = mock(MessagesManager.class);
UUID accountUuid = UUID.randomUUID(); UUID accountUuid = UUID.randomUUID();
UUID senderOneUuid = UUID.randomUUID(); UUID senderOneUuid = UUID.randomUUID();
UUID senderTwoUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID();
List<Envelope> outgoingMessages = List.of(createMessage("sender1", senderOneUuid, UUID.randomUUID(), 1111, "first"), List<Envelope> outgoingMessages = List.of(createMessage(senderOneUuid, UUID.randomUUID(), 1111, "first"),
createMessage("sender1", senderOneUuid, UUID.randomUUID(), 2222, createMessage(senderOneUuid, UUID.randomUUID(), 2222,
RandomStringUtils.randomAlphanumeric(WebSocketConnection.MAX_DESKTOP_MESSAGE_SIZE + 1)), RandomStringUtils.randomAlphanumeric(WebSocketConnection.MAX_DESKTOP_MESSAGE_SIZE + 1)),
createMessage("sender2", senderTwoUuid, UUID.randomUUID(), 3333, "third")); createMessage(senderTwoUuid, UUID.randomUUID(), 3333, "third"));
when(device.getId()).thenReturn(2L); when(device.getId()).thenReturn(2L);
@ -862,7 +862,7 @@ class WebSocketConnectionTest {
verify(client, never()).close(anyInt(), anyString()); verify(client, never()).close(anyInt(), anyString());
} }
private Envelope createMessage(String sender, UUID senderUuid, UUID destinationUuid, long timestamp, String content) { private Envelope createMessage(UUID senderUuid, UUID destinationUuid, long timestamp, String content) {
return Envelope.newBuilder() return Envelope.newBuilder()
.setServerGuid(UUID.randomUUID().toString()) .setServerGuid(UUID.randomUUID().toString())
.setType(Envelope.Type.CIPHERTEXT) .setType(Envelope.Type.CIPHERTEXT)