From 65da844d70369cb8b44966cfb2d2eb9b925a6ba4 Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Tue, 9 Aug 2022 15:32:44 -0500 Subject: [PATCH] Small test cleanup --- .../metrics/MessageMetricsTest.java | 1 + .../websocket/WebSocketConnectionTest.java | 40 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java index 3a47f4fec..34489dfc3 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MessageMetricsTest.java @@ -35,6 +35,7 @@ class MessageMetricsTest { void setup() { when(account.getUuid()).thenReturn(aci); when(account.getPhoneNumberIdentifier()).thenReturn(pni); + Metrics.globalRegistry.clear(); simpleMeterRegistry = new SimpleMeterRegistry(); Metrics.globalRegistry.add(simpleMeterRegistry); } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java index 6632ee367..08f93290b 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java @@ -144,9 +144,9 @@ class WebSocketConnectionTest { UUID senderOneUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID(); - List outgoingMessages = List.of(createMessage("sender1", senderOneUuid, accountUuid, 1111, "first"), - createMessage("sender1", senderOneUuid, accountUuid, 2222, "second"), - createMessage("sender2", senderTwoUuid, accountUuid, 3333, "third")); + List outgoingMessages = List.of(createMessage(senderOneUuid, accountUuid, 1111, "first"), + createMessage(senderOneUuid, accountUuid, 2222, "second"), + createMessage(senderTwoUuid, accountUuid, 3333, "third")); final long deviceId = 2L; when(device.getId()).thenReturn(deviceId); @@ -225,8 +225,8 @@ class WebSocketConnectionTest { when(messagesManager.getMessagesForDevice(eq(accountUuid), eq(1L), eq("Test-UA"), anyBoolean())) .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("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")), false)); + .thenReturn(new Pair<>(List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first")), false)) + .thenReturn(new Pair<>(List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second")), false)); final WebSocketResponseMessage successResponse = mock(WebSocketResponseMessage.class); when(successResponse.getStatus()).thenReturn(200); @@ -432,11 +432,11 @@ class WebSocketConnectionTest { when(client.getUserAgent()).thenReturn("Test-UA"); final List firstPageMessages = - List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), - createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); + List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), + createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); final List 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)) .thenReturn(new Pair<>(firstPageMessages, true)) @@ -477,7 +477,7 @@ class WebSocketConnectionTest { final UUID senderUuid = UUID.randomUUID(); final List 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)) .thenReturn(new Pair<>(messages, false)); @@ -563,11 +563,11 @@ class WebSocketConnectionTest { when(client.getUserAgent()).thenReturn("Test-UA"); final List firstPageMessages = - List.of(createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), - createMessage("sender1", UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); + List.of(createMessage(UUID.randomUUID(), UUID.randomUUID(), 1111, "first"), + createMessage(UUID.randomUUID(), UUID.randomUUID(), 2222, "second")); final List 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())) .thenReturn(new Pair<>(firstPageMessages, false)) @@ -670,10 +670,10 @@ class WebSocketConnectionTest { UUID senderTwoUuid = UUID.randomUUID(); List outgoingMessages = List.of( - createMessage("sender1", senderOneUuid, UUID.randomUUID(), 1111, "first"), - createMessage("sender1", senderOneUuid, UUID.randomUUID(), 2222, + createMessage(senderOneUuid, UUID.randomUUID(), 1111, "first"), + createMessage(senderOneUuid, UUID.randomUUID(), 2222, 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); @@ -736,14 +736,14 @@ class WebSocketConnectionTest { void testSendOversizedMessagesForNonDesktop() { MessagesManager storedMessages = mock(MessagesManager.class); - UUID accountUuid = UUID.randomUUID(); + UUID accountUuid = UUID.randomUUID(); UUID senderOneUuid = UUID.randomUUID(); UUID senderTwoUuid = UUID.randomUUID(); - List outgoingMessages = List.of(createMessage("sender1", senderOneUuid, UUID.randomUUID(), 1111, "first"), - createMessage("sender1", senderOneUuid, UUID.randomUUID(), 2222, + List outgoingMessages = List.of(createMessage(senderOneUuid, UUID.randomUUID(), 1111, "first"), + createMessage(senderOneUuid, UUID.randomUUID(), 2222, 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); @@ -862,7 +862,7 @@ class WebSocketConnectionTest { 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() .setServerGuid(UUID.randomUUID().toString()) .setType(Envelope.Type.CIPHERTEXT)