Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 11:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use strongly-typed ACIs and PNIs everywhere.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-28 12:58:04 -04:00
parent 7ff4a82755
commit 82906aee58
146 changed files with 1416 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientIdCacheTest.java
View File

@@ -7,6 +7,7 @@ import org.junit.Before;
import org.junit.Test;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.testutil.LogRecorder;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.Optional;
@@ -40,7 +41,7 @@ public final class RecipientIdCacheTest {
@Test
public void empty_access_by_uuid() {
RecipientId recipientId = recipientIdCache.get(ServiceId.from(UUID.randomUUID()), null);
RecipientId recipientId = recipientIdCache.get(ACI.from(UUID.randomUUID()), null);
assertNull(recipientId);
}
@@ -55,7 +56,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_hit_by_uuid() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
@@ -67,8 +68,8 @@ public final class RecipientIdCacheTest {
@Test
public void cache_miss_by_uuid() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid2 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
ServiceId sid2 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
@@ -80,7 +81,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_hit_by_uuid_e164_not_supplied_on_get() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"));
@@ -92,7 +93,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_miss_by_uuid_e164_not_supplied_on_put() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
@@ -129,7 +130,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_hit_by_e164_uuid_not_supplied_on_get() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"));
@@ -141,7 +142,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_miss_by_e164_uuid_not_supplied_on_put() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
@@ -154,7 +155,7 @@ public final class RecipientIdCacheTest {
@Test
public void cache_hit_by_both() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, sid1, e164));
@@ -167,7 +168,7 @@ public final class RecipientIdCacheTest {
@Test
public void full_recipient_id_learned_by_two_puts() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, sid1, null));
@@ -182,7 +183,7 @@ public final class RecipientIdCacheTest {
public void if_cache_state_disagrees_returns_null() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid = ServiceId.from(UUID.randomUUID());
ServiceId sid = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
@@ -200,7 +201,7 @@ public final class RecipientIdCacheTest {
public void after_invalid_cache_hit_entries_are_cleared_up() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid = ServiceId.from(UUID.randomUUID());
ServiceId sid = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
@@ -216,8 +217,8 @@ public final class RecipientIdCacheTest {
public void multiple_entries() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid2 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
ServiceId sid2 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
recipientIdCache.put(recipient(recipientId2, sid2, null));
@@ -229,12 +230,12 @@ public final class RecipientIdCacheTest {
@Test
public void drops_oldest_when_reaches_cache_limit() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
for (int i = 0; i < TEST_CACHE_LIMIT; i++) {
recipientIdCache.put(recipient(recipientId(), ServiceId.from(UUID.randomUUID()), null));
recipientIdCache.put(recipient(recipientId(), ACI.from(UUID.randomUUID()), null));
}
assertNull(recipientIdCache.get(sid1, null));
@@ -243,17 +244,17 @@ public final class RecipientIdCacheTest {
@Test
public void remains_in_cache_when_used_before_reaching_cache_limit() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ServiceId.from(UUID.randomUUID());
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
for (int i = 0; i < TEST_CACHE_LIMIT - 1; i++) {
recipientIdCache.put(recipient(recipientId(), ServiceId.from(UUID.randomUUID()), null));
recipientIdCache.put(recipient(recipientId(), ACI.from(UUID.randomUUID()), null));
}
assertEquals(recipientId1, recipientIdCache.get(sid1, null));
recipientIdCache.put(recipient(recipientId(), ServiceId.from(UUID.randomUUID()), null));
recipientIdCache.put(recipient(recipientId(), ACI.from(UUID.randomUUID()), null));
assertEquals(recipientId1, recipientIdCache.get(sid1, null));
}