From aeb9f67266be0c480ab7494968114e4791254f9b Mon Sep 17 00:00:00 2001 From: Chris Eager Date: Tue, 24 Aug 2021 18:30:59 -0500 Subject: [PATCH] Migrate MessageSenderTest to JUnit 5 --- .../textsecuregcm/push/MessageSenderTest.java | 202 +++++++++--------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/push/MessageSenderTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/push/MessageSenderTest.java index 7e286b410..fe334d926 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/push/MessageSenderTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/MessageSenderTest.java @@ -20,8 +20,8 @@ import static org.mockito.Mockito.when; import com.google.protobuf.ByteString; import java.util.UUID; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.whispersystems.textsecuregcm.entities.MessageProtos; import org.whispersystems.textsecuregcm.metrics.PushLatencyManager; @@ -29,134 +29,134 @@ import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.MessagesManager; -public class MessageSenderTest { +class MessageSenderTest { - private Account account; - private Device device; - private MessageProtos.Envelope message; + private Account account; + private Device device; + private MessageProtos.Envelope message; - private ClientPresenceManager clientPresenceManager; - private MessagesManager messagesManager; - private GCMSender gcmSender; - private APNSender apnSender; - private MessageSender messageSender; + private ClientPresenceManager clientPresenceManager; + private MessagesManager messagesManager; + private GCMSender gcmSender; + private APNSender apnSender; + private MessageSender messageSender; - private static final UUID ACCOUNT_UUID = UUID.randomUUID(); - private static final long DEVICE_ID = 1L; + private static final UUID ACCOUNT_UUID = UUID.randomUUID(); + private static final long DEVICE_ID = 1L; - @Before - public void setUp() { + @BeforeEach + void setUp() { - account = mock(Account.class); - device = mock(Device.class); - message = generateRandomMessage(); + account = mock(Account.class); + device = mock(Device.class); + message = generateRandomMessage(); - clientPresenceManager = mock(ClientPresenceManager.class); - messagesManager = mock(MessagesManager.class); - gcmSender = mock(GCMSender.class); - apnSender = mock(APNSender.class); - messageSender = new MessageSender(mock(ApnFallbackManager.class), - clientPresenceManager, - messagesManager, - gcmSender, - apnSender, - mock(PushLatencyManager.class)); + clientPresenceManager = mock(ClientPresenceManager.class); + messagesManager = mock(MessagesManager.class); + gcmSender = mock(GCMSender.class); + apnSender = mock(APNSender.class); + messageSender = new MessageSender(mock(ApnFallbackManager.class), + clientPresenceManager, + messagesManager, + gcmSender, + apnSender, + mock(PushLatencyManager.class)); - when(account.getUuid()).thenReturn(ACCOUNT_UUID); - when(device.getId()).thenReturn(DEVICE_ID); - } + when(account.getUuid()).thenReturn(ACCOUNT_UUID); + when(device.getId()).thenReturn(DEVICE_ID); + } - @Test - public void testSendOnlineMessageClientPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true); - when(device.getGcmId()).thenReturn("gcm-id"); + @Test + void testSendOnlineMessageClientPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true); + when(device.getGcmId()).thenReturn("gcm-id"); - messageSender.sendMessage(account, device, message, true); + messageSender.sendMessage(account, device, message, true); - ArgumentCaptor envelopeArgumentCaptor = ArgumentCaptor.forClass( - MessageProtos.Envelope.class); + ArgumentCaptor envelopeArgumentCaptor = ArgumentCaptor.forClass( + MessageProtos.Envelope.class); - verify(messagesManager).insert(any(), anyLong(), envelopeArgumentCaptor.capture()); + verify(messagesManager).insert(any(), anyLong(), envelopeArgumentCaptor.capture()); - assertTrue(envelopeArgumentCaptor.getValue().getEphemeral()); + assertTrue(envelopeArgumentCaptor.getValue().getEphemeral()); - verifyNoInteractions(gcmSender); - verifyNoInteractions(apnSender); - } + verifyNoInteractions(gcmSender); + verifyNoInteractions(apnSender); + } - @Test - public void testSendOnlineMessageClientNotPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); - when(device.getGcmId()).thenReturn("gcm-id"); + @Test + void testSendOnlineMessageClientNotPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); + when(device.getGcmId()).thenReturn("gcm-id"); - messageSender.sendMessage(account, device, message, true); + messageSender.sendMessage(account, device, message, true); - verify(messagesManager, never()).insert(any(), anyLong(), any()); - verifyNoInteractions(gcmSender); - verifyNoInteractions(apnSender); - } + verify(messagesManager, never()).insert(any(), anyLong(), any()); + verifyNoInteractions(gcmSender); + verifyNoInteractions(apnSender); + } - @Test - public void testSendMessageClientPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true); - when(device.getGcmId()).thenReturn("gcm-id"); + @Test + void testSendMessageClientPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true); + when(device.getGcmId()).thenReturn("gcm-id"); - messageSender.sendMessage(account, device, message, false); + messageSender.sendMessage(account, device, message, false); - final ArgumentCaptor envelopeArgumentCaptor = ArgumentCaptor.forClass( - MessageProtos.Envelope.class); + final ArgumentCaptor envelopeArgumentCaptor = ArgumentCaptor.forClass( + MessageProtos.Envelope.class); - verify(messagesManager).insert(eq(ACCOUNT_UUID), eq(DEVICE_ID), envelopeArgumentCaptor.capture()); + verify(messagesManager).insert(eq(ACCOUNT_UUID), eq(DEVICE_ID), envelopeArgumentCaptor.capture()); - assertFalse(envelopeArgumentCaptor.getValue().getEphemeral()); - assertEquals(message, envelopeArgumentCaptor.getValue()); - verifyNoInteractions(gcmSender); - verifyNoInteractions(apnSender); - } + assertFalse(envelopeArgumentCaptor.getValue().getEphemeral()); + assertEquals(message, envelopeArgumentCaptor.getValue()); + verifyNoInteractions(gcmSender); + verifyNoInteractions(apnSender); + } - @Test - public void testSendMessageGcmClientNotPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); - when(device.getGcmId()).thenReturn("gcm-id"); + @Test + void testSendMessageGcmClientNotPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); + when(device.getGcmId()).thenReturn("gcm-id"); - messageSender.sendMessage(account, device, message, false); + messageSender.sendMessage(account, device, message, false); - verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); - verify(gcmSender).sendMessage(any()); - verifyNoInteractions(apnSender); - } + verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); + verify(gcmSender).sendMessage(any()); + verifyNoInteractions(apnSender); + } - @Test - public void testSendMessageApnClientNotPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); - when(device.getApnId()).thenReturn("apn-id"); + @Test + void testSendMessageApnClientNotPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); + when(device.getApnId()).thenReturn("apn-id"); - messageSender.sendMessage(account, device, message, false); + messageSender.sendMessage(account, device, message, false); - verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); - verifyNoInteractions(gcmSender); - verify(apnSender).sendMessage(any()); - } + verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); + verifyNoInteractions(gcmSender); + verify(apnSender).sendMessage(any()); + } - @Test - public void testSendMessageFetchClientNotPresent() throws Exception { - when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); - when(device.getFetchesMessages()).thenReturn(true); + @Test + void testSendMessageFetchClientNotPresent() throws Exception { + when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false); + when(device.getFetchesMessages()).thenReturn(true); - messageSender.sendMessage(account, device, message, false); + messageSender.sendMessage(account, device, message, false); - verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); - verifyNoInteractions(gcmSender); - verifyNoInteractions(apnSender); - } + verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message); + verifyNoInteractions(gcmSender); + verifyNoInteractions(apnSender); + } - private MessageProtos.Envelope generateRandomMessage() { - return MessageProtos.Envelope.newBuilder() - .setTimestamp(System.currentTimeMillis()) - .setServerTimestamp(System.currentTimeMillis()) - .setContent(ByteString.copyFromUtf8(RandomStringUtils.randomAlphanumeric(256))) - .setType(MessageProtos.Envelope.Type.CIPHERTEXT) - .setServerGuid(UUID.randomUUID().toString()) - .build(); - } + private MessageProtos.Envelope generateRandomMessage() { + return MessageProtos.Envelope.newBuilder() + .setTimestamp(System.currentTimeMillis()) + .setServerTimestamp(System.currentTimeMillis()) + .setContent(ByteString.copyFromUtf8(RandomStringUtils.randomAlphanumeric(256))) + .setType(MessageProtos.Envelope.Type.CIPHERTEXT) + .setServerGuid(UUID.randomUUID().toString()) + .build(); + } }