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

Convert more tests to kotlin.

Browse Source 
Resolves #13829
This commit is contained in:
Jameson Williams
2024-12-06 23:45:13 -06:00
committed by Greyson Parrelli
parent 574d6c51ab
commit c2aceb2bd1
12 changed files with 965 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,275 +0,0 @@
package org.thoughtcrime.securesms.recipients;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
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;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public final class RecipientIdCacheTest {
private static final int TEST_CACHE_LIMIT = 5;
private RecipientIdCache recipientIdCache;
private LogRecorder logRecorder;
@Before
public void setup() {
recipientIdCache = new RecipientIdCache(TEST_CACHE_LIMIT);
logRecorder = new LogRecorder();
Log.initialize(logRecorder);
}
@Test
public void empty_access_by_nulls() {
RecipientId recipientId = recipientIdCache.get(null, null);
assertNull(recipientId);
}
@Test
public void empty_access_by_uuid() {
RecipientId recipientId = recipientIdCache.get(ACI.from(UUID.randomUUID()), null);
assertNull(recipientId);
}
@Test
public void empty_access_by_e164() {
RecipientId recipientId = recipientIdCache.get(null, "+155512345");
assertNull(recipientId);
}
@Test
public void cache_hit_by_uuid() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
RecipientId recipientId = recipientIdCache.get(sid1, null);
assertEquals(recipientId1, recipientId);
}
@Test
public void cache_miss_by_uuid() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
ServiceId sid2 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
RecipientId recipientId = recipientIdCache.get(sid2, null);
assertNull(recipientId);
}
@Test
public void cache_hit_by_uuid_e164_not_supplied_on_get() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"));
RecipientId recipientId = recipientIdCache.get(sid1, null);
assertEquals(recipientId1, recipientId);
}
@Test
public void cache_miss_by_uuid_e164_not_supplied_on_put() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
RecipientId recipientId = recipientIdCache.get(sid1, "+15551234567");
assertNull(recipientId);
}
@Test
public void cache_hit_by_e164() {
RecipientId recipientId1 = recipientId();
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
RecipientId recipientId = recipientIdCache.get(null, e164);
assertEquals(recipientId1, recipientId);
}
@Test
public void cache_miss_by_e164() {
RecipientId recipientId1 = recipientId();
String e164a = "+1555123456";
String e164b = "+1555123457";
recipientIdCache.put(recipient(recipientId1, null, e164a));
RecipientId recipientId = recipientIdCache.get(null, e164b);
assertNull(recipientId);
}
@Test
public void cache_hit_by_e164_uuid_not_supplied_on_get() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"));
RecipientId recipientId = recipientIdCache.get(null, "+15551234567");
assertEquals(recipientId1, recipientId);
}
@Test
public void cache_miss_by_e164_uuid_not_supplied_on_put() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
RecipientId recipientId = recipientIdCache.get(sid1, e164);
assertNull(recipientId);
}
@Test
public void cache_hit_by_both() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, sid1, e164));
RecipientId recipientId = recipientIdCache.get(sid1, e164);
assertEquals(recipientId1, recipientId);
}
@Test
public void full_recipient_id_learned_by_two_puts() {
RecipientId recipientId1 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, sid1, null));
recipientIdCache.put(recipient(recipientId1, null, e164));
RecipientId recipientId = recipientIdCache.get(sid1, e164);
assertEquals(recipientId1, recipientId);
}
@Test
public void if_cache_state_disagrees_returns_null() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
recipientIdCache.put(recipient(recipientId2, sid, null));
RecipientId recipientId = recipientIdCache.get(sid, e164);
assertNull(recipientId);
assertEquals(1, logRecorder.getWarnings().size());
assertEquals("Seen invalid RecipientIdCacheState", logRecorder.getWarnings().get(0).getMessage());
}
@Test
public void after_invalid_cache_hit_entries_are_cleared_up() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid = ACI.from(UUID.randomUUID());
String e164 = "+1555123456";
recipientIdCache.put(recipient(recipientId1, null, e164));
recipientIdCache.put(recipient(recipientId2, sid, null));
recipientIdCache.get(sid, e164);
assertNull(recipientIdCache.get(sid, null));
assertNull(recipientIdCache.get(null, e164));
}
@Test
public void multiple_entries() {
RecipientId recipientId1 = recipientId();
RecipientId recipientId2 = recipientId();
ServiceId sid1 = ACI.from(UUID.randomUUID());
ServiceId sid2 = ACI.from(UUID.randomUUID());
recipientIdCache.put(recipient(recipientId1, sid1, null));
recipientIdCache.put(recipient(recipientId2, sid2, null));
assertEquals(recipientId1, recipientIdCache.get(sid1, null));
assertEquals(recipientId2, recipientIdCache.get(sid2, null));
}
@Test
public void drops_oldest_when_reaches_cache_limit() {
RecipientId recipientId1 = recipientId();
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(), ACI.from(UUID.randomUUID()), null));
}
assertNull(recipientIdCache.get(sid1, null));
}
@Test
public void remains_in_cache_when_used_before_reaching_cache_limit() {
RecipientId recipientId1 = recipientId();
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(), ACI.from(UUID.randomUUID()), null));
}
assertEquals(recipientId1, recipientIdCache.get(sid1, null));
recipientIdCache.put(recipient(recipientId(), ACI.from(UUID.randomUUID()), null));
assertEquals(recipientId1, recipientIdCache.get(sid1, null));
}
private static @NonNull RecipientId recipientId() {
return mock(RecipientId.class);
}
private static @NonNull Recipient recipient(RecipientId recipientId, @Nullable ServiceId serviceId, @Nullable String e164) {
Recipient mock = mock(Recipient.class);
when(mock.getId()).thenReturn(recipientId);
when(mock.getServiceId()).thenReturn(Optional.ofNullable(serviceId));
when(mock.getE164()).thenReturn(Optional.ofNullable(e164));
return mock;
}
}

264
app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientIdCacheTest.kt Normal file
View File

@@ -0,0 +1,264 @@
package org.thoughtcrime.securesms.recipients
import io.mockk.every
import io.mockk.mockk
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.testutil.LogRecorder
import org.whispersystems.signalservice.api.push.ServiceId
import java.util.Optional
import java.util.UUID
class RecipientIdCacheTest {
private val recipientIdCache = RecipientIdCache(TEST_CACHE_LIMIT)
private val logRecorder = LogRecorder().apply { Log.initialize(this) }
@Test
fun empty_access_by_nulls() {
val recipientId = recipientIdCache[null, null]
assertNull(recipientId)
}
@Test
fun empty_access_by_uuid() {
val recipientId = recipientIdCache[randomAci(), null]
assertNull(recipientId)
}
@Test
fun empty_access_by_e164() {
val recipientId = recipientIdCache[null, "+155512345"]
assertNull(recipientId)
}
@Test
fun cache_hit_by_uuid() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
val recipientId = recipientIdCache[sid1, null]
assertEquals(recipientId1, recipientId)
}
@Test
fun cache_miss_by_uuid() {
val recipientId1 = recipientId()
val sid1 = randomAci()
val sid2 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
val recipientId = recipientIdCache[sid2, null]
assertNull(recipientId)
}
@Test
fun cache_hit_by_uuid_e164_not_supplied_on_get() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"))
val recipientId = recipientIdCache[sid1, null]
assertEquals(recipientId1, recipientId)
}
@Test
fun cache_miss_by_uuid_e164_not_supplied_on_put() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
val recipientId = recipientIdCache[sid1, "+15551234567"]
assertNull(recipientId)
}
@Test
fun cache_hit_by_e164() {
val recipientId1 = recipientId()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, null, e164))
val recipientId = recipientIdCache[null, e164]
assertEquals(recipientId1, recipientId)
}
@Test
fun cache_miss_by_e164() {
val recipientId1 = recipientId()
val e164a = "+1555123456"
val e164b = "+1555123457"
recipientIdCache.put(recipient(recipientId1, null, e164a))
val recipientId = recipientIdCache[null, e164b]
assertNull(recipientId)
}
@Test
fun cache_hit_by_e164_uuid_not_supplied_on_get() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, "+15551234567"))
val recipientId = recipientIdCache[null, "+15551234567"]
assertEquals(recipientId1, recipientId)
}
@Test
fun cache_miss_by_e164_uuid_not_supplied_on_put() {
val recipientId1 = recipientId()
val sid1 = randomAci()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, null, e164))
val recipientId = recipientIdCache[sid1, e164]
assertNull(recipientId)
}
@Test
fun cache_hit_by_both() {
val recipientId1 = recipientId()
val sid1 = randomAci()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, sid1, e164))
val recipientId = recipientIdCache[sid1, e164]
assertEquals(recipientId1, recipientId)
}
@Test
fun full_recipient_id_learned_by_two_puts() {
val recipientId1 = recipientId()
val sid1 = randomAci()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, sid1, null))
recipientIdCache.put(recipient(recipientId1, null, e164))
val recipientId = recipientIdCache[sid1, e164]
assertEquals(recipientId1, recipientId)
}
@Test
fun if_cache_state_disagrees_returns_null() {
val recipientId1 = recipientId()
val recipientId2 = recipientId()
val sid = randomAci()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, null, e164))
recipientIdCache.put(recipient(recipientId2, sid, null))
val recipientId = recipientIdCache[sid, e164]
assertNull(recipientId)
assertEquals(1, logRecorder.warnings.size)
assertEquals("Seen invalid RecipientIdCacheState", logRecorder.warnings.single().message)
}
@Test
fun after_invalid_cache_hit_entries_are_cleared_up() {
val recipientId1 = recipientId()
val recipientId2 = recipientId()
val sid = randomAci()
val e164 = "+1555123456"
recipientIdCache.put(recipient(recipientId1, null, e164))
recipientIdCache.put(recipient(recipientId2, sid, null))
recipientIdCache[sid, e164]
assertNull(recipientIdCache[sid, null])
assertNull(recipientIdCache[null, e164])
}
@Test
fun multiple_entries() {
val recipientId1 = recipientId()
val recipientId2 = recipientId()
val sid1 = randomAci()
val sid2 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
recipientIdCache.put(recipient(recipientId2, sid2, null))
assertEquals(recipientId1, recipientIdCache[sid1, null])
assertEquals(recipientId2, recipientIdCache[sid2, null])
}
@Test
fun drops_oldest_when_reaches_cache_limit() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
for (i in 0 until TEST_CACHE_LIMIT) {
recipientIdCache.put(recipient(recipientId(), randomAci(), null))
}
assertNull(recipientIdCache[sid1, null])
}
@Test
fun remains_in_cache_when_used_before_reaching_cache_limit() {
val recipientId1 = recipientId()
val sid1 = randomAci()
recipientIdCache.put(recipient(recipientId1, sid1, null))
for (i in 0 until TEST_CACHE_LIMIT - 1) {
recipientIdCache.put(recipient(recipientId(), randomAci(), null))
}
assertEquals(recipientId1, recipientIdCache[sid1, null])
recipientIdCache.put(recipient(recipientId(), randomAci(), null))
assertEquals(recipientId1, recipientIdCache[sid1, null])
}
companion object {
private const val TEST_CACHE_LIMIT = 5
private fun recipientId(): RecipientId {
return mockk<RecipientId>()
}
private fun randomAci(): ServiceId {
return ServiceId.ACI.from(UUID.randomUUID())
}
private fun recipient(recipientId: RecipientId, serviceId: ServiceId?, e164: String?): Recipient {
return mockk<Recipient> {
every { this@mockk.id } returns recipientId
every { this@mockk.serviceId } returns Optional.ofNullable(serviceId)
every { this@mockk.e164 } returns Optional.ofNullable(e164)
}
}
}
}