Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-08-21 15:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update AccountTest for cases where accounts may not have phone numbers

Browse Source
This commit is contained in:
Jon Chambers
2026-08-11 09:08:13 -07:00
committed by Ameya Lokare
parent 10c98c5f87
commit e36e740bc0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountTest.java
+10 -2
View File
@@ -114,6 +114,13 @@ class AccountTest {
account.setDiscoverableByPhoneNumber(true);
assertTrue(account.isDiscoverableByPhoneNumber());
final Account numberlessAccount = AccountsHelper.generateTestAccount(null, UUID.randomUUID(), null, List.of(recentPrimaryDevice), null);
assertFalse(numberlessAccount.isDiscoverableByPhoneNumber());
numberlessAccount.setDiscoverableByPhoneNumber(true);
assertFalse(numberlessAccount.isDiscoverableByPhoneNumber(),
"Accounts without phone numbers should never be discoverable by phone number");
}
@Test
@@ -126,15 +133,16 @@ class AccountTest {
"1234".getBytes(StandardCharsets.UTF_8)).hasCapability(DeviceCapability.TRANSFER));
}
@Test
void stale() {
final Account account = AccountsHelper.generateTestAccount("+14151234567", UUID.randomUUID(), UUID.randomUUID(), Collections.emptyList(),
new byte[0]);
assertDoesNotThrow(account::getNumber);
assertDoesNotThrow(account::getNumberOptional);
account.markStale();
assertThrows(AssertionError.class, account::getNumber);
assertThrows(AssertionError.class, account::getNumberOptional);
assertDoesNotThrow(account::getAccountIdentifier);
}
service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AccountsHelper.java
-1
View File
@@ -54,7 +54,6 @@ public class AccountsHelper {
public static Account generateTestAccount(@Nullable String number, UUID uuid, final @Nullable UUID phoneNumberIdentifier, List<Device> devices, byte[] unidentifiedAccessKey) {
return generateTestAccount(number, uuid, phoneNumberIdentifier, devices, unidentifiedAccessKey, TestRandomUtil.nextBytes(16));
}
public static Account generateTestAccount(@Nullable String number, UUID uuid, final @Nullable UUID phoneNumberIdentifier, List<Device> devices, byte[] unidentifiedAccessKey, final byte[] accountRecoveryPassword) {