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

Include required device capabilities when creating users in integration tests

Browse Source
This commit is contained in:
Jon Chambers
2026-03-06 15:40:44 -05:00
committed by Jon Chambers
parent 1cf3bf5ecf
commit aae1541e88
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/test/java/org/whispersystems/textsecuregcm/controllers/RegistrationControllerTest.java
View File

@@ -91,8 +91,6 @@ import org.whispersystems.textsecuregcm.util.SystemMapper;
class RegistrationControllerTest {
private static final long SESSION_EXPIRATION_SECONDS = Duration.ofMinutes(10).toSeconds();
private static final Set<DeviceCapability> SPQR_DEVICE_CAPABILITIES =
Set.of(DeviceCapability.SPARSE_POST_QUANTUM_RATCHET);
private static final String NUMBER = PhoneNumberUtil.getInstance().format(
PhoneNumberUtil.getInstance().getExampleNumber("US"),
@@ -541,11 +539,11 @@ class RegistrationControllerTest {
final AccountAttributes fetchesMessagesAccountAttributes =
new AccountAttributes(true, 1, 1, "test".getBytes(StandardCharsets.UTF_8), null, true,
SPQR_DEVICE_CAPABILITIES);
DeviceCapability.CAPABILITIES_REQUIRED_FOR_REGISTRATION);
final AccountAttributes pushAccountAttributes =
new AccountAttributes(false, 1, 1, "test".getBytes(StandardCharsets.UTF_8), null, true,
SPQR_DEVICE_CAPABILITIES);
DeviceCapability.CAPABILITIES_REQUIRED_FOR_REGISTRATION);
return List.of(
Arguments.argumentSet("\"Fetches messages\" is true, but an APNs token is provided",
@@ -632,7 +630,7 @@ class RegistrationControllerTest {
final AccountAttributes accountAttributes =
new AccountAttributes(true, 1, 1, "test".getBytes(StandardCharsets.UTF_8), null, true,
SPQR_DEVICE_CAPABILITIES);
DeviceCapability.CAPABILITIES_REQUIRED_FOR_REGISTRATION);
return List.of(
Arguments.argumentSet("Signed PNI EC pre-key is missing",
@@ -857,7 +855,7 @@ class RegistrationControllerTest {
final int registrationId = 1;
final int pniRegistrationId = 2;
final Set<DeviceCapability> deviceCapabilities = SPQR_DEVICE_CAPABILITIES;
final Set<DeviceCapability> deviceCapabilities = DeviceCapability.CAPABILITIES_REQUIRED_FOR_REGISTRATION;
final AccountAttributes fetchesMessagesAccountAttributes =
new AccountAttributes(true, registrationId, pniRegistrationId, "test".getBytes(StandardCharsets.UTF_8), null, true, deviceCapabilities);
@@ -1010,7 +1008,7 @@ class RegistrationControllerTest {
final boolean skipDeviceTransfer,
final int registrationId,
final int pniRegistrationId) {
return requestToJson(request(sessionId, recoveryPassword, skipDeviceTransfer, registrationId, pniRegistrationId, SPQR_DEVICE_CAPABILITIES));
return requestToJson(request(sessionId, recoveryPassword, skipDeviceTransfer, registrationId, pniRegistrationId, DeviceCapability.CAPABILITIES_REQUIRED_FOR_REGISTRATION));
}
/**