Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-02 12:52:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a test for fetching messages with a "discardable" first page

Browse Source
This commit is contained in:
Jon Chambers
2026-03-13 09:32:02 -04:00
committed by Jon Chambers
parent 206f114b34
commit bd97e70a56
2 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
View File

@@ -168,7 +168,9 @@ public class MessagesCache {
static final Duration MAX_EPHEMERAL_MESSAGE_DELAY = Duration.ofSeconds(10);
private static final String GET_FLUX_NAME = MetricsUtil.name(MessagesCache.class, "get");
private static final int PAGE_SIZE = 100;
@VisibleForTesting
static final int PAGE_SIZE = 100;
private static final int REMOVE_MRM_RECIPIENT_VIEW_CONCURRENCY = 8;

50
service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
View File

@@ -272,6 +272,40 @@ class MessagesCacheTest {
assertEquals(List.of(message2), get(DESTINATION_UUID, DESTINATION_DEVICE_ID, 1));
}
@Test
void testGetMessagesFirstPageDiscarded() {
final int discardableMessages = MessagesCache.PAGE_SIZE * 2;
final int deliverableMessages = MessagesCache.PAGE_SIZE + 1;
final Instant now = Instant.now();
final ServiceIdentifier destinationServiceIdentifier = new AciServiceIdentifier(DESTINATION_UUID);
for (int i = 0; i < discardableMessages; i++) {
final UUID messageGuid = UUID.randomUUID();
final long timestamp = now.minus(MessagesCache.MAX_EPHEMERAL_MESSAGE_DELAY.multipliedBy(2)).toEpochMilli() + i;
final MessageProtos.Envelope message =
generateRandomMessage(messageGuid, destinationServiceIdentifier, true, true, timestamp);
messagesCache.insert(messageGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, message).join();
}
final List<MessageProtos.Envelope> expectedMessages = new ArrayList<>(deliverableMessages);
for (int i = 0; i < deliverableMessages; i++) {
final UUID messageGuid = UUID.randomUUID();
final long timestamp = now.plusMillis(i).toEpochMilli();
final MessageProtos.Envelope message =
generateRandomMessage(messageGuid, destinationServiceIdentifier, true, false, timestamp);
messagesCache.insert(messageGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, message).join();
expectedMessages.add(message);
}
assertEquals(expectedMessages, get(DESTINATION_UUID, DESTINATION_DEVICE_ID, deliverableMessages + discardableMessages));
}
@ParameterizedTest
@ValueSource(booleans = {true, false})
void testGetMessagesPublisher(final boolean expectStale) throws Exception {
@@ -896,24 +930,30 @@ class MessagesCacheTest {
}
private MessageProtos.Envelope generateRandomMessage(final UUID messageGuid, final boolean sealedSender) {
return generateRandomMessage(messageGuid, new AciServiceIdentifier(UUID.randomUUID()), sealedSender,
return generateRandomMessage(messageGuid, new AciServiceIdentifier(UUID.randomUUID()), sealedSender, false,
serialTimestamp++);
}
private MessageProtos.Envelope generateRandomMessage(final UUID messageGuid,
final ServiceIdentifier destinationServiceId, final boolean sealedSender) {
return generateRandomMessage(messageGuid, destinationServiceId, sealedSender, serialTimestamp++);
final ServiceIdentifier destinationServiceId,
final boolean sealedSender) {
return generateRandomMessage(messageGuid, destinationServiceId, sealedSender, false, serialTimestamp++);
}
private MessageProtos.Envelope generateRandomMessage(final UUID messageGuid,
final ServiceIdentifier destinationServiceId, final boolean sealedSender, final long timestamp) {
final ServiceIdentifier destinationServiceId,
final boolean sealedSender,
final boolean ephemeral,
final long timestamp) {
final MessageProtos.Envelope.Builder envelopeBuilder = MessageProtos.Envelope.newBuilder()
.setClientTimestamp(timestamp)
.setServerTimestamp(timestamp)
.setContent(ByteString.copyFromUtf8(RandomStringUtils.secure().nextAlphanumeric(256)))
.setType(MessageProtos.Envelope.Type.CIPHERTEXT)
.setServerGuid(messageGuid.toString())
.setDestinationServiceId(destinationServiceId.toServiceIdentifierString());
.setDestinationServiceId(destinationServiceId.toServiceIdentifierString())
.setEphemeral(ephemeral);
if (!sealedSender) {
envelopeBuilder.setSourceDevice(random.nextInt(Device.MAXIMUM_DEVICE_ID) + 1)