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

Convert tests from Hamcrest -> AssertK.

Browse Source
This commit is contained in:
Jameson Williams
2025-01-07 22:07:09 -06:00
committed by Greyson Parrelli
parent 33c918defd
commit 1509e3ed79
48 changed files with 1078 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepositoryTest.kt
View File

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.components.settings.app.subscription
import android.app.Application
import androidx.lifecycle.AtomicReference
import assertk.assertThat
import assertk.assertions.isNotEqualTo
import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkObject
@@ -18,7 +20,6 @@ import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.signal.donations.InAppPaymentType
import org.signal.donations.PaymentSourceType
import org.thoughtcrime.securesms.assertIsNot
import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
import org.thoughtcrime.securesms.database.InAppPaymentTable
import org.thoughtcrime.securesms.database.SignalDatabase
@@ -106,7 +107,7 @@ class RecurringInAppPaymentRepositoryTest {
val newSubscriber = ref.get()
newSubscriber assertIsNot initialSubscriber
assertThat(newSubscriber).isNotEqualTo(initialSubscriber)
}
@Test
@@ -124,7 +125,7 @@ class RecurringInAppPaymentRepositoryTest {
val newSubscriber = ref.get()
newSubscriber assertIsNot initialSubscriber
assertThat(newSubscriber).isNotEqualTo(initialSubscriber)
}
@Test
@@ -136,7 +137,7 @@ class RecurringInAppPaymentRepositoryTest {
rxRule.defaultScheduler.triggerActions()
testObserver.assertComplete()
ref.get() assertIsNot null
assertThat(ref.get()).isNotEqualTo(null)
verify(inverse = true) {
AppDependencies.donationsService.cancelSubscription(any())
}
@@ -152,7 +153,7 @@ class RecurringInAppPaymentRepositoryTest {
rxRule.defaultScheduler.triggerActions()
testObserver.assertComplete()
ref.get() assertIsNot null
assertThat(ref.get()).isNotEqualTo(null)
verify {
AppDependencies.donationsService.cancelSubscription(any())
}

42
app/src/test/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdateTest.kt
View File

@@ -1,9 +1,9 @@
package org.thoughtcrime.securesms.components.webrtc
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.containsInAnyOrder
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import assertk.assertThat
import assertk.assertions.containsExactlyInAnyOrder
import assertk.assertions.isFalse
import assertk.assertions.isTrue
import org.junit.Test
import org.thoughtcrime.securesms.events.CallParticipant
import org.thoughtcrime.securesms.events.CallParticipant.Companion.createRemote
@@ -21,8 +21,8 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate(added, removed)
// THEN
assertTrue(update.hasNoChanges())
assertFalse(update.hasSingleChange())
assertThat(update.hasNoChanges()).isTrue()
assertThat(update.hasSingleChange()).isFalse()
}
@Test
@@ -33,8 +33,8 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate(added, removed)
// THEN
assertFalse(update.hasNoChanges())
assertFalse(update.hasSingleChange())
assertThat(update.hasNoChanges()).isFalse()
assertThat(update.hasSingleChange()).isFalse()
}
@Test
@@ -45,8 +45,8 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate(added, removed)
// THEN
assertFalse(update.hasNoChanges())
assertFalse(update.hasSingleChange())
assertThat(update.hasNoChanges()).isFalse()
assertThat(update.hasSingleChange()).isFalse()
}
@Test
@@ -57,8 +57,8 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate(added, removed)
// THEN
assertFalse(update.hasNoChanges())
assertTrue(update.hasSingleChange())
assertThat(update.hasNoChanges()).isFalse()
assertThat(update.hasSingleChange()).isTrue()
}
@Test
@@ -70,9 +70,9 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate.computeDeltaUpdate(emptyList(), newList)
// THEN
assertFalse(update.hasNoChanges())
assertTrue(update.removed.isEmpty())
assertThat(update.added, containsInAnyOrder(*createWrappers(1, 2, 3, 4, 5)))
assertThat(update.hasNoChanges()).isFalse()
assertThat(update.removed.isEmpty()).isTrue()
assertThat(update.added).containsExactlyInAnyOrder(*createWrappers(1, 2, 3, 4, 5))
}
@Test
@@ -84,7 +84,7 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate.computeDeltaUpdate(newList, newList)
// THEN
assertTrue(update.hasNoChanges())
assertThat(update.hasNoChanges()).isTrue()
}
@Test
@@ -96,7 +96,7 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate.computeDeltaUpdate(emptyList(), newList)
// THEN
assertTrue(update.hasNoChanges())
assertThat(update.hasNoChanges()).isTrue()
}
@Test
@@ -109,9 +109,9 @@ class CallParticipantListUpdateTest {
val update = CallParticipantListUpdate.computeDeltaUpdate(list1, list2)
// THEN
assertFalse(update.hasNoChanges())
assertThat(update.added, containsInAnyOrder(*createWrappers(6)))
assertThat(update.removed, containsInAnyOrder(*createWrappers(1)))
assertThat(update.hasNoChanges()).isFalse()
assertThat(update.added).containsExactlyInAnyOrder(*createWrappers(6))
assertThat(update.removed).containsExactlyInAnyOrder(*createWrappers(1))
}
@Test
@@ -124,7 +124,7 @@ class CallParticipantListUpdateTest {
// THEN
val isPrimaryList = update.added.map { it.callParticipant.isPrimary }.toList()
assertThat(isPrimaryList, containsInAnyOrder(true, false, false))
assertThat(isPrimaryList).containsExactlyInAnyOrder(true, false, false)
}
companion object {