Migrate to AssertK

JakeWharton · JakeWharton · commit 632556a8e98f · 2025-09-10T14:08:55.000-04:00
diff --git a/copper-flow/build.gradle b/copper-flow/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
   androidTestImplementation project(':copper-testing')
   androidTestImplementation libs.androidx.test.runner
-  androidTestImplementation libs.truth
+  androidTestImplementation libs.assertk
   androidTestImplementation libs.turbine
 }
 
diff --git a/copper-flow/src/androidTest/java/app/cash/copper/flow/AsRowsTest.kt b/copper-flow/src/androidTest/java/app/cash/copper/flow/AsRowsTest.kt
@@ -5,13 +5,14 @@ import app.cash.copper.testing.Employee
 import app.cash.copper.testing.Employee.Companion.queryOf
 import app.cash.copper.testing.NullQuery
 import app.cash.turbine.test
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import kotlin.time.ExperimentalTime
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.time.ExperimentalTime
 
 @ExperimentalCoroutinesApi
 @ExperimentalTime
diff --git a/copper-flow/src/androidTest/java/app/cash/copper/flow/OperatorTest.kt b/copper-flow/src/androidTest/java/app/cash/copper/flow/OperatorTest.kt
@@ -19,9 +19,13 @@ import android.database.Cursor
 import app.cash.copper.testing.Employee
 import app.cash.copper.testing.Employee.Companion.queryOf
 import app.cash.copper.testing.NullQuery
-import app.cash.copper.testing.assert
 import app.cash.turbine.test
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.hasMessage
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isInstanceOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
@@ -53,9 +57,9 @@ class OperatorTest {
     flowOf(queryOf("alice", "Alice Allison", "bob", "Bob Bobberson"))
       .mapToOne(mapper = Employee.MAPPER)
       .test {
-        awaitError().assert {
-          isInstanceOf(IllegalStateException::class.java)
-          hasMessageThat().isEqualTo("Cursor returned more than 1 row")
+        assertThat(awaitError())
+          .isInstanceOf<IllegalStateException>()
+          .hasMessage("Cursor returned more than 1 row")
         }
       }
   }
@@ -156,9 +160,9 @@ class OperatorTest {
     flowOf(queryOf("alice", "Alice Allison", "bob", "Bob Bobberson"))
       .mapToOneOrNull(mapper = Employee.MAPPER)
       .test {
-        awaitError().assert {
-          isInstanceOf(IllegalStateException::class.java)
-          hasMessageThat().isEqualTo("Cursor returned more than 1 row")
+        assertThat(awaitError())
+          .isInstanceOf<IllegalStateException>()
+          .hasMessage("Cursor returned more than 1 row")
         }
       }
   }
diff --git a/copper-rx2/build.gradle b/copper-rx2/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
   androidTestImplementation project(':copper-testing')
   androidTestImplementation libs.androidx.test.runner
-  androidTestImplementation libs.truth
+  androidTestImplementation libs.assertk
 }
 
 android {
diff --git a/copper-rx2/src/androidTest/java/app/cash/copper/rx2/AsRowsTest.java b/copper-rx2/src/androidTest/java/app/cash/copper/rx2/AsRowsTest.java
@@ -11,7 +11,7 @@
 import org.junit.runner.RunWith;
 
 import static app.cash.copper.testing.Employee.queryOf;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
 @SuppressWarnings("CheckResult")
@@ -45,7 +45,7 @@ public final class AsRowsTest {
         .test()
         .assertValue(new Employee("alice", "Alice Allison"))
         .assertComplete();
-    assertThat(count.get()).isEqualTo(1);
+    assertEquals(1, count.get());
   }
 
   @Test public void asRowsEmptyWhenNullCursor() {
@@ -60,6 +60,6 @@ public final class AsRowsTest {
       .assertNoValues()
       .assertComplete();
 
-    assertThat(count.get()).isEqualTo(0);
+    assertEquals(0, count.get());
   }
 }
diff --git a/copper-rx3/build.gradle b/copper-rx3/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
   androidTestImplementation project(':copper-testing')
   androidTestImplementation libs.androidx.test.runner
-  androidTestImplementation libs.truth
+  androidTestImplementation libs.assertk
 }
 
 android {
diff --git a/copper-rx3/src/androidTest/java/app/cash/copper/rx3/AsRowsTest.java b/copper-rx3/src/androidTest/java/app/cash/copper/rx3/AsRowsTest.java
@@ -11,7 +11,7 @@
 import org.junit.runner.RunWith;
 
 import static app.cash.copper.testing.Employee.queryOf;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(AndroidJUnit4.class)
 @SuppressWarnings("CheckResult")
@@ -45,7 +45,7 @@ public final class AsRowsTest {
         .test()
         .assertValue(new Employee("alice", "Alice Allison"))
         .assertComplete();
-    assertThat(count.get()).isEqualTo(1);
+    assertEquals(1, count.get());
   }
 
   @Test public void asRowsEmptyWhenNullCursor() {
@@ -60,6 +60,6 @@ public final class AsRowsTest {
       .assertNoValues()
       .assertComplete();
 
-    assertThat(count.get()).isEqualTo(0);
+    assertEquals(0, count.get());
   }
 }
diff --git a/copper-testing/build.gradle b/copper-testing/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'org.jetbrains.kotlin.android'
 
 dependencies {
   api project(':copper')
-  api libs.truth
+  api libs.assertk
 }
 
 android {
diff --git a/copper-testing/src/main/java/app/cash/copper/testing/CursorAssert.kt b/copper-testing/src/main/java/app/cash/copper/testing/CursorAssert.kt
@@ -2,20 +2,19 @@ package app.cash.copper.testing
 
 import android.database.Cursor
 import app.cash.copper.Query
-import com.google.common.truth.Truth.assertWithMessage
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isTrue
 
 class CursorAssert(private val cursor: Cursor) {
   private var row = 0
 
   fun hasRow(vararg values: Any?) = apply {
-    assertWithMessage("row " + (row + 1) + " exists")
-      .that(cursor.moveToNext())
-      .isTrue()
+    assertThat(cursor.moveToNext(), name = "row ${row + 1} exists").isTrue()
     row += 1
-    assertWithMessage("column count").that(cursor.columnCount).isEqualTo(values.size)
+    assertThat(cursor.columnCount, name = "column count").isEqualTo(values.size)
     for (i in values.indices) {
-      assertWithMessage("row " + row + " column '" + cursor.getColumnName(i) + "'")
-        .that(cursor.getString(i))
+      assertThat(cursor.getString(i), name = "row $row column '${cursor.getColumnName(i)}'")
         .isEqualTo(values[i])
     }
   }
diff --git a/copper-testing/src/main/java/app/cash/copper/testing/truth.kt b/copper-testing/src/main/java/app/cash/copper/testing/truth.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,6 +11,6 @@ rxjava3 = "io.reactivex.rxjava3:rxjava:3.1.11"
 
 kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
 turbine = "app.cash.turbine:turbine:1.2.1"
-truth = "com.google.truth:truth:1.4.4"
+assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
 dokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
 gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.34.0"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ dependencies {`
`9`	`9`
`10`	`10`	`androidTestImplementation project(':copper-testing')`
`11`	`11`	`androidTestImplementation libs.androidx.test.runner`
`12`		`- androidTestImplementation libs.truth`
	`12`	`+ androidTestImplementation libs.assertk`
`13`	`13`	`androidTestImplementation libs.turbine`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ apply plugin: 'org.jetbrains.kotlin.android'`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`api project(':copper')`
`6`		`- api libs.truth`
	`6`	`+ api libs.assertk`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`