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

Convert tests to Kotlin, remove Hamcrest.

Browse Source 
Resolves #13884
This commit is contained in:
Jameson Williams
2025-01-07 18:20:37 -06:00
committed by Greyson Parrelli
parent 2a2a6e6a0d
commit 33c918defd
19 changed files with 2001 additions and 1703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
app/src/test/java/org/thoughtcrime/securesms/contacts/SelectedContactSetTest.java
View File

@@ -1,104 +0,0 @@
package org.thoughtcrime.securesms.contacts;
import org.junit.Test;
import org.thoughtcrime.securesms.recipients.RecipientId;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
public final class SelectedContactSetTest {
private final SelectedContactSet selectedContactSet = new SelectedContactSet();
@Test
public void add_without_recipient_ids() {
SelectedContact contact1 = SelectedContact.forPhone(null, "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(null, "@alice");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertThat(selectedContactSet.getContacts(), is(asList(contact1, contact2)));
}
@Test
public void add_with_recipient_ids() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertThat(selectedContactSet.getContacts(), is(asList(contact1, contact2)));
}
@Test
public void add_with_same_recipient_id() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(1), "@alice");
assertTrue(selectedContactSet.add(contact1));
assertFalse(selectedContactSet.add(contact2));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact1)));
}
@Test
public void remove_by_recipient_id() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice" );
SelectedContact contact2Remove = SelectedContact.forUsername(RecipientId.from(2), "@alice2");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertEquals(1, selectedContactSet.remove(contact2Remove));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact1)));
}
@Test
public void remove_by_number() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice");
SelectedContact contact1Remove = SelectedContact.forPhone(null, "+1-555-000-0000");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertEquals(1, selectedContactSet.remove(contact1Remove));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact2)));
}
@Test
public void remove_by_username() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice");
SelectedContact contact2Remove = SelectedContact.forUsername(null, "@alice");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertEquals(1, selectedContactSet.remove(contact2Remove));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact1)));
}
@Test
public void remove_by_recipient_id_and_username() {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice");
SelectedContact contact3 = SelectedContact.forUsername(null, "@bob");
SelectedContact contact2Remove = SelectedContact.forUsername(RecipientId.from(1), "@bob");
assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2));
assertTrue(selectedContactSet.add(contact3));
assertEquals(2, selectedContactSet.remove(contact2Remove));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact2)));
}
}

100
app/src/test/java/org/thoughtcrime/securesms/contacts/SelectedContactSetTest.kt Normal file
View File

@@ -0,0 +1,100 @@
package org.thoughtcrime.securesms.contacts
import assertk.assertThat
import assertk.assertions.containsExactly
import assertk.assertions.isEqualTo
import assertk.assertions.isFalse
import assertk.assertions.isTrue
import org.junit.Test
import org.thoughtcrime.securesms.recipients.RecipientId
class SelectedContactSetTest {
private val selectedContactSet = SelectedContactSet()
@Test
fun add_without_recipient_ids() {
val contact1 = SelectedContact.forPhone(null, "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(null, "@alice")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.contacts).containsExactly(contact1, contact2)
}
@Test
fun add_with_recipient_ids() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.contacts).containsExactly(contact1, contact2)
}
@Test
fun add_with_same_recipient_id() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(1), "@alice")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isFalse()
assertThat(selectedContactSet.contacts).containsExactly(contact1)
}
@Test
fun remove_by_recipient_id() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice")
val contact2Remove = SelectedContact.forUsername(RecipientId.from(2), "@alice2")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.remove(contact2Remove)).isEqualTo(1)
assertThat(selectedContactSet.contacts).containsExactly(contact1)
}
@Test
fun remove_by_number() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice")
val contact1Remove = SelectedContact.forPhone(null, "+1-555-000-0000")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.remove(contact1Remove).toLong()).isEqualTo(1)
assertThat(selectedContactSet.contacts).containsExactly(contact2)
}
@Test
fun remove_by_username() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice")
val contact2Remove = SelectedContact.forUsername(null, "@alice")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.remove(contact2Remove)).isEqualTo(1)
assertThat(selectedContactSet.contacts).containsExactly(contact1)
}
@Test
fun remove_by_recipient_id_and_username() {
val contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000")
val contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice")
val contact3 = SelectedContact.forUsername(null, "@bob")
val contact2Remove = SelectedContact.forUsername(RecipientId.from(1), "@bob")
assertThat(selectedContactSet.add(contact1)).isTrue()
assertThat(selectedContactSet.add(contact2)).isTrue()
assertThat(selectedContactSet.add(contact3)).isTrue()
assertThat(selectedContactSet.remove(contact2Remove)).isEqualTo(2)
assertThat(selectedContactSet.contacts).containsExactly(contact2)
}
}