Migrate kt tests off hamcrest

app/build.gradle.kts

@@ -615,6 +615,7 @@ dependencies {
   androidTestImplementation(testLibs.androidx.test.core)
   androidTestImplementation(testLibs.androidx.test.core.ktx)
   androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
+  androidTestImplementation(testLibs.assertk)
   androidTestImplementation(testLibs.mockk.android)
   androidTestImplementation(testLibs.square.okhttp.mockserver)
   androidTestImplementation(testLibs.diff.utils)

app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt

@@ -5,6 +5,9 @@ import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.FlakyTest
 import androidx.test.platform.app.InstrumentationRegistry
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEqualTo
 import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
@@ -22,8 +25,6 @@ import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.mms.MediaStream
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream
@@ -142,8 +143,8 @@ class AttachmentTableTest {
     val highInfo = SignalDatabase.attachments.getDataFileInfo(highDatabaseAttachment.attachmentId)!!
 
     assertNotEquals(standardInfo, highInfo)
-    highInfo.file assertIsNot standardInfo.file
-    highInfo.file.exists() assertIs true
+    assertThat(highInfo.file).isNotEqualTo(standardInfo.file)
+    assertThat(highInfo.file.exists()).isEqualTo(true)
   }
 
   /**
@@ -174,10 +175,10 @@ class AttachmentTableTest {
     val highInfo = SignalDatabase.attachments.getDataFileInfo(highDatabaseAttachment.attachmentId)!!
     val secondHighInfo = SignalDatabase.attachments.getDataFileInfo(secondHighDatabaseAttachment.attachmentId)!!
 
-    highInfo.file assertIsNot standardInfo.file
-    secondHighInfo.file assertIs highInfo.file
-    standardInfo.file.exists() assertIs true
-    highInfo.file.exists() assertIs true
+    assertThat(highInfo.file).isNotEqualTo(standardInfo.file)
+    assertThat(secondHighInfo.file).isEqualTo(highInfo.file)
+    assertThat(standardInfo.file.exists()).isEqualTo(true)
+    assertThat(highInfo.file.exists()).isEqualTo(true)
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTableTest.kt

@@ -1,14 +1,15 @@
 package org.thoughtcrime.securesms.database
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.count
 import org.signal.core.util.readToSingleInt
 import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
 
 @RunWith(AndroidJUnit4::class)
 class BackupMediaSnapshotTableTest {
@@ -27,7 +28,7 @@ class BackupMediaSnapshotTableTest {
 
     val count = getSyncedItemCount(pendingSyncTime)
 
-    count.assertIs(0)
+    assertThat(count).isEqualTo(0)
   }
 
   @Test
@@ -38,7 +39,7 @@ class BackupMediaSnapshotTableTest {
 
     val count = getSyncedItemCount(pendingSyncTime)
 
-    count.assertIs(SEQUENCE_COUNT)
+    assertThat(count).isEqualTo(SEQUENCE_COUNT)
   }
 
   @Test
@@ -56,7 +57,7 @@ class BackupMediaSnapshotTableTest {
       .run()
       .readToSingleInt(-1)
 
-    count.assertIs(50)
+    assertThat(count).isEqualTo(50)
   }
 
   @Test
@@ -77,8 +78,8 @@ class BackupMediaSnapshotTableTest {
 
     val total = getTotalItemCount()
 
-    count.assertIs(50)
-    total.assertIs(SEQUENCE_COUNT)
+    assertThat(count).isEqualTo(50)
+    assertThat(total).isEqualTo(SEQUENCE_COUNT)
   }
 
   @Test
@@ -96,7 +97,7 @@ class BackupMediaSnapshotTableTest {
 
     val total = getTotalItemCount()
 
-    total.assertIs(50)
+    assertThat(total).isEqualTo(50)
   }
 
   private fun getTotalItemCount(): Int {

app/src/androidTest/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTableTest.kt

@@ -1,6 +1,9 @@
 package org.thoughtcrime.securesms.database
 
 import android.database.sqlite.SQLiteConstraintException
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
 import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Rule
@@ -12,7 +15,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaym
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.util.Currency
@@ -191,11 +193,11 @@ class InAppPaymentSubscriberTableTest {
       .run()
       .readToSingleInt()
 
-    subscriberCount assertIs 1
+    assertThat(subscriberCount).isEqualTo(1)
 
     val subscriber = InAppPaymentsRepository.requireSubscriber(InAppPaymentSubscriberRecord.Type.BACKUP)
-    subscriber.iapSubscriptionId?.originalTransactionId assertIs null
-    subscriber.iapSubscriptionId?.purchaseToken assertIs "testToken"
-    subscriber.subscriberId assertIs googleSubscriber.subscriberId
+    assertThat(subscriber.iapSubscriptionId?.originalTransactionId).isNull()
+    assertThat(subscriber.iapSubscriptionId?.purchaseToken).isEqualTo("testToken")
+    assertThat(subscriber.subscriberId).isEqualTo(googleSubscriber.subscriberId)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/InAppPaymentTableTest.kt

@@ -6,6 +6,8 @@
 package org.thoughtcrime.securesms.database
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -14,7 +16,6 @@ import org.signal.core.util.deleteAll
 import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
 
 @RunWith(AndroidJUnit4::class)
 class InAppPaymentTableTest {
@@ -37,13 +38,13 @@ class InAppPaymentTableTest {
     )
 
     val paymentBeforeUpdate = SignalDatabase.inAppPayments.getById(inAppPaymentId)
-    paymentBeforeUpdate?.state assertIs InAppPaymentTable.State.CREATED
+    assertThat(paymentBeforeUpdate?.state).isEqualTo(InAppPaymentTable.State.CREATED)
 
     SignalDatabase.inAppPayments.update(
       inAppPayment = paymentBeforeUpdate!!.copy(state = InAppPaymentTable.State.PENDING)
     )
 
     val paymentAfterUpdate = SignalDatabase.inAppPayments.getById(inAppPaymentId)
-    paymentAfterUpdate?.state assertIs InAppPaymentTable.State.PENDING
+    assertThat(paymentAfterUpdate?.state).isEqualTo(InAppPaymentTable.State.PENDING)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/LogDatabaseTest.kt

@@ -5,6 +5,10 @@
 
 package org.thoughtcrime.securesms.database
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isTrue
 import org.junit.Test
 import org.signal.core.util.forEach
 import org.signal.core.util.requireLong
@@ -13,7 +17,6 @@ import org.signal.core.util.select
 import org.signal.core.util.updateAll
 import org.thoughtcrime.securesms.crash.CrashConfig
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.testing.assertIs
 
 class LogDatabaseTest {
 
@@ -37,7 +40,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -58,7 +61,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -79,7 +82,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -100,7 +103,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -121,7 +124,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -142,7 +145,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs true
+    assertThat(foundMatch).isTrue()
   }
 
   @Test
@@ -163,7 +166,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs false
+    assertThat(foundMatch).isFalse()
   }
 
   @Test
@@ -184,7 +187,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs false
+    assertThat(foundMatch).isFalse()
   }
 
   @Test
@@ -205,7 +208,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime
     )
 
-    foundMatch assertIs false
+    assertThat(foundMatch).isFalse()
   }
 
   @Test
@@ -231,7 +234,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime - 100
     )
 
-    foundMatch assertIs false
+    assertThat(foundMatch).isFalse()
   }
 
   @Test
@@ -245,7 +248,7 @@ class LogDatabaseTest {
       promptThreshold = currentTime - 100
     )
 
-    foundMatch assertIs false
+    assertThat(foundMatch).isFalse()
   }
 
   @Test
@@ -279,9 +282,9 @@ class LogDatabaseTest {
       .run()
       .forEach {
         if (it.requireNonNullString(LogDatabase.CrashTable.NAME) == "TestName") {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs currentTime
+          assertThat(it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT)).isEqualTo(currentTime)
         } else {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs 0
+          assertThat(it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT)).isEqualTo(0)
         }
       }
   }