Collapse WebsocketSender into PushSender.

2026-04-21 13:58:07 +01:00 · 2020-09-18 15:55:53 -04:00
parent 5e30b0499a
commit 74b3daa70a
5 changed files with 239 additions and 155 deletions
--- a/service/src/test/java/org/whispersystems/textsecuregcm/push/PushSenderTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/push/PushSenderTest.java
@@ -0,0 +1,150 @@
+package org.whispersystems.textsecuregcm.push;
+
+import com.google.protobuf.ByteString;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.whispersystems.textsecuregcm.entities.MessageProtos;
+import org.whispersystems.textsecuregcm.metrics.PushLatencyManager;
+import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.storage.MessagesManager;
+
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+public class PushSenderTest {
+
+    private Account                account;
+    private Device                 device;
+    private MessageProtos.Envelope message;
+
+    private ClientPresenceManager clientPresenceManager;
+    private MessagesManager       messagesManager;
+    private GCMSender             gcmSender;
+    private APNSender             apnSender;
+    private PushSender            pushSender;
+
+    private static final UUID ACCOUNT_UUID = UUID.randomUUID();
+    private static final long DEVICE_ID = 1L;
+
+    @Before
+    public void setUp() {
+
+        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);
+        pushSender            = new PushSender(mock(ApnFallbackManager.class),
+                                               clientPresenceManager,
+                                               messagesManager,
+                                               gcmSender,
+                                               apnSender,
+                                               0,
+                                               mock(ExecutorService.class),
+                                               mock(PushLatencyManager.class));
+
+        when(account.getUuid()).thenReturn(ACCOUNT_UUID);
+        when(device.getId()).thenReturn(DEVICE_ID);
+    }
+
+    @Test
+    public void testSendOnlineMessageClientPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true);
+        when(device.getGcmId()).thenReturn("gcm-id");
+
+        pushSender.sendSynchronousMessage(account, device, message, true);
+
+        verify(messagesManager).insertEphemeral(ACCOUNT_UUID, DEVICE_ID, message);
+        verify(messagesManager, never()).insert(any(), anyLong(), any());
+        verifyZeroInteractions(gcmSender);
+        verifyZeroInteractions(apnSender);
+    }
+
+    @Test
+    public void testSendOnlineMessageClientNotPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false);
+        when(device.getGcmId()).thenReturn("gcm-id");
+
+        pushSender.sendSynchronousMessage(account, device, message, true);
+
+        verify(messagesManager, never()).insertEphemeral(any(), anyLong(), any());
+        verify(messagesManager, never()).insert(any(), anyLong(), any());
+        verifyZeroInteractions(gcmSender);
+        verifyZeroInteractions(apnSender);
+    }
+
+    @Test
+    public void testSendMessageClientPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(true);
+        when(device.getGcmId()).thenReturn("gcm-id");
+
+        pushSender.sendSynchronousMessage(account, device, message, false);
+
+        verify(messagesManager, never()).insertEphemeral(any(), anyLong(), any());
+        verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message);
+        verifyZeroInteractions(gcmSender);
+        verifyZeroInteractions(apnSender);
+    }
+
+    @Test
+    public void testSendMessageGcmClientNotPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false);
+        when(device.getGcmId()).thenReturn("gcm-id");
+
+        pushSender.sendSynchronousMessage(account, device, message, false);
+
+        verify(messagesManager, never()).insertEphemeral(any(), anyLong(), any());
+        verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message);
+        verify(gcmSender).sendMessage(any());
+        verifyZeroInteractions(apnSender);
+    }
+
+    @Test
+    public void testSendMessageApnClientNotPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false);
+        when(device.getApnId()).thenReturn("apn-id");
+
+        pushSender.sendSynchronousMessage(account, device, message, false);
+
+        verify(messagesManager, never()).insertEphemeral(any(), anyLong(), any());
+        verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message);
+        verifyZeroInteractions(gcmSender);
+        verify(apnSender).sendMessage(any());
+    }
+
+    @Test
+    public void testSendMessageFetchClientNotPresent() {
+        when(clientPresenceManager.isPresent(ACCOUNT_UUID, DEVICE_ID)).thenReturn(false);
+        when(device.getFetchesMessages()).thenReturn(true);
+
+        pushSender.sendSynchronousMessage(account, device, message, false);
+
+        verify(messagesManager, never()).insertEphemeral(any(), anyLong(), any());
+        verify(messagesManager).insert(ACCOUNT_UUID, DEVICE_ID, message);
+        verifyZeroInteractions(gcmSender);
+        verifyZeroInteractions(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();
+    }
+}