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

Add more tests

Browse Source
This commit is contained in:
Ehren Kret
2021-05-18 12:40:37 -05:00
parent c595d9415c
commit 0cd3640f13
3 changed files with 173 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
View File

@@ -665,7 +665,8 @@ public class MessageController {
}
}
private void validateRegistrationIds(Account account, List<IncomingMessage> messages)
@VisibleForTesting
public static void validateRegistrationIds(Account account, List<IncomingMessage> messages)
throws StaleDevicesException {
final Stream<Pair<Long, Integer>> deviceIdAndRegistrationIdStream = messages
.stream()
@@ -673,7 +674,8 @@ public class MessageController {
validateRegistrationIds(account, deviceIdAndRegistrationIdStream);
}
private void validateRegistrationIds(Account account, Stream<Pair<Long, Integer>> deviceIdAndRegistrationIdStream)
@VisibleForTesting
public static void validateRegistrationIds(Account account, Stream<Pair<Long, Integer>> deviceIdAndRegistrationIdStream)
throws StaleDevicesException {
final List<Long> staleDevices = deviceIdAndRegistrationIdStream
.filter(deviceIdAndRegistrationId -> deviceIdAndRegistrationId.second() > 0)
@@ -689,18 +691,16 @@ public class MessageController {
}
}
private void validateCompleteDeviceList(Account account, List<IncomingMessage> messages, boolean isSyncMessage)
@VisibleForTesting
public static void validateCompleteDeviceList(Account account, List<IncomingMessage> messages, boolean isSyncMessage)
throws MismatchedDevicesException {
Set<Long> messageDeviceIds = messages.stream().map(IncomingMessage::getDestinationDeviceId).collect(Collectors.toSet());
validateCompleteDeviceList(account, messageDeviceIds, isSyncMessage);
}
private void validateCompleteDeviceList(Account account,
Set<Long> messageDeviceIds,
boolean isSyncMessage)
throws MismatchedDevicesException
{
@VisibleForTesting
public static void validateCompleteDeviceList(Account account, Set<Long> messageDeviceIds, boolean isSyncMessage)
throws MismatchedDevicesException {
Set<Long> accountDeviceIds = new HashSet<>();
List<Long> missingDeviceIds = new LinkedList<>();

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/StaleDevicesException.java
View File

@@ -8,7 +8,7 @@ package org.whispersystems.textsecuregcm.controllers;
import java.util.List;
public class StaleDevicesException extends Throwable {
public class StaleDevicesException extends Exception {
private final List<Long> staleDevices;
public StaleDevicesException(List<Long> staleDevices) {