Merge pull request #3178 from square/bquenaudon.2024-11-15.assertk

Migrate from AsssertJ to AssertK
square · Nov 15, 2024 · 747eaf3 · 747eaf3
2 parents db02978 + c394f17
commit 747eaf3
Show file tree

Hide file tree

Showing 82 changed files with 462 additions and 242 deletions.
diff --git a/samples/wire-codegen-sample/build.gradle.kts b/samples/wire-codegen-sample/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
   implementation(libs.guava)
   implementation(libs.javapoet)
   testImplementation(libs.junit)
-  testImplementation(libs.assertj)
+  testImplementation(libs.assertk)
 }
diff --git a/samples/wire-codegen-sample/src/test/java/com/squareup/wire/sample/ServiceGeneratorTest.kt b/samples/wire-codegen-sample/src/test/java/com/squareup/wire/sample/ServiceGeneratorTest.kt
@@ -15,6 +15,8 @@
  */
 package com.squareup.wire.sample
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import com.palantir.javapoet.JavaFile
 import com.palantir.javapoet.TypeSpec
 import com.squareup.wire.java.JavaGenerator
@@ -26,7 +28,6 @@ import java.io.IOException
 import java.nio.file.FileSystems
 import okio.buffer
 import okio.sink
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder

diff --git a/wire-compiler/build.gradle.kts b/wire-compiler/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
   implementation(libs.kotlin.serialization)
   implementation(libs.kaml)
   testImplementation(libs.junit)
-  testImplementation(libs.assertj)
+  testImplementation(libs.assertk)
   testImplementation(libs.kotlin.test.junit)
   testImplementation(projects.wireTestUtils)
 }
diff --git a/wire-compiler/src/test/java/com/squareup/wire/CommandLineOptionsTest.kt b/wire-compiler/src/test/java/com/squareup/wire/CommandLineOptionsTest.kt
@@ -15,12 +15,17 @@
  */
 package com.squareup.wire
 
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.containsOnly
+import assertk.assertions.hasMessage
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
 import com.squareup.wire.schema.WireRun
 import java.io.File
 import java.io.FileOutputStream
 import java.io.PrintWriter
 import kotlin.test.assertFailsWith
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class CommandLineOptionsTest {

diff --git a/wire-compiler/src/test/java/com/squareup/wire/ManifestParseTest.kt b/wire-compiler/src/test/java/com/squareup/wire/ManifestParseTest.kt
@@ -15,7 +15,10 @@
  */
 package com.squareup.wire
 
-import org.assertj.core.api.Assertions.assertThat
+import assertk.assertThat
+import assertk.assertions.containsExactlyInAnyOrder
+import assertk.assertions.containsOnly
+import assertk.assertions.messageContains
 import org.junit.Assert.fail
 import org.junit.Test
 
@@ -56,7 +59,7 @@ class ManifestParseTest {
       parseManifestModules(yaml)
       fail()
     } catch (e: Exception) {
-      assertThat(e).hasMessageContaining("Unknown property 'includes'")
+      assertThat(e).messageContains("Unknown property 'includes'")
     }
   }
 
@@ -69,7 +72,7 @@ class ManifestParseTest {
     """.trimMargin()
 
     val modules = parseManifestModules(yaml)
-    assertThat(modules.keys).containsExactly("one", "two")
-    assertThat(modules.getValue("one").dependencies).containsExactly("two")
+    assertThat(modules.keys).containsOnly("one", "two")
+    assertThat(modules.getValue("one").dependencies).containsOnly("two")
   }
 }
diff --git a/wire-compiler/src/test/java/com/squareup/wire/WireCompilerErrorTest.kt b/wire-compiler/src/test/java/com/squareup/wire/WireCompilerErrorTest.kt
@@ -15,12 +15,15 @@
  */
 package com.squareup.wire
 
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.doesNotContain
+import assertk.assertions.hasMessage
 import com.squareup.wire.schema.SchemaException
 import kotlin.test.assertFailsWith
 import okio.Path
 import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class WireCompilerErrorTest {

diff --git a/wire-compiler/src/test/java/com/squareup/wire/WireCompilerTest.kt b/wire-compiler/src/test/java/com/squareup/wire/WireCompilerTest.kt
@@ -17,13 +17,17 @@
 
 package com.squareup.wire
 
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEmpty
+import assertk.assertions.size
 import com.squareup.wire.schema.ProtoType
 import java.util.Collections
 import okio.FileSystem
 import okio.Path
 import okio.Path.Companion.toOkioPath
 import okio.Path.Companion.toPath
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -826,8 +830,8 @@ class WireCompilerTest {
 
   private fun assertOutputs(target: TargetLanguage, outputs: Array<String>, suffix: String = "") {
     val filesAfter = paths
-    assertThat(filesAfter.size)
-      .overridingErrorMessage(filesAfter.toString())
+    assertThat(filesAfter)
+      .size()
       .isEqualTo(outputs.size)
 
     for (output in outputs) {

diff --git a/wire-compiler/src/test/java/com/squareup/wire/schema/CycleCheckerTest.kt b/wire-compiler/src/test/java/com/squareup/wire/schema/CycleCheckerTest.kt
@@ -17,11 +17,12 @@
 
 package com.squareup.wire.schema
 
+import assertk.assertThat
+import assertk.assertions.hasMessage
 import com.squareup.wire.testing.add
 import kotlin.test.assertFailsWith
 import okio.Path
 import okio.fakefilesystem.FakeFileSystem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class CycleCheckerTest {

diff --git a/wire-compiler/src/test/java/com/squareup/wire/schema/LinkerTest.kt b/wire-compiler/src/test/java/com/squareup/wire/schema/LinkerTest.kt
@@ -17,13 +17,18 @@
 
 package com.squareup.wire.schema
 
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import assertk.assertions.messageContains
 import com.squareup.wire.testing.add
 import kotlin.test.assertFailsWith
 import okio.ForwardingFileSystem
 import okio.Path
 import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class LinkerTest {
@@ -144,7 +149,7 @@ class LinkerTest {
     val exception = assertFailsWith<SchemaException> {
       loadAndLinkSchema(opaqueTypes = listOf(ProtoType.get("cafe.Roast")))
     }
-    assertThat(exception).hasMessageContaining(
+    assertThat(exception).messageContains(
       """
       |Enums like cafe.Roast cannot be opaqued
       |  for field roast (source-path/cafe/cafe.proto:11:3)
@@ -297,7 +302,7 @@ class LinkerTest {
     val exception = assertFailsWith<SchemaException> {
       loadAndLinkSchema(opaqueTypes = listOf(ProtoType.INT32))
     }
-    assertThat(exception).hasMessageContaining(
+    assertThat(exception).messageContains(
       """
       |Scalar types like int32 cannot be opaqued
       |  for field size_ounces (source-path/cafe/cafe.proto:6:3)

diff --git a/wire-compiler/src/test/java/com/squareup/wire/schema/OptionsLinkingTest.kt b/wire-compiler/src/test/java/com/squareup/wire/schema/OptionsLinkingTest.kt
@@ -17,11 +17,13 @@
 
 package com.squareup.wire.schema
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
 import com.squareup.wire.testing.add
 import okio.Path
 import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 
 class OptionsLinkingTest {

diff --git a/wire-compiler/src/test/java/com/squareup/wire/schema/WireRunTest.kt b/wire-compiler/src/test/java/com/squareup/wire/schema/WireRunTest.kt
@@ -15,6 +15,14 @@
  */
 package com.squareup.wire.schema
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.doesNotContain
+import assertk.assertions.hasMessage
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEmpty
 import com.squareup.wire.StringWireLogger
 import com.squareup.wire.WireLogger
 import com.squareup.wire.WireLogger.Companion.NONE
@@ -30,7 +38,6 @@ import kotlin.test.assertFailsWith
 import okio.Path
 import okio.Path.Companion.toPath
 import okio.fakefilesystem.FakeFileSystem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Assert.fail
 import org.junit.Test
 
@@ -145,12 +152,13 @@ class WireRunTest {
     assertThat(fs.findFiles("generated")).containsExactlyInAnyOrderAsRelativePaths(
       "generated/kt/squareup/routes/RouteBlockingServer.kt",
     )
-    assertThat(fs.readUtf8("generated/kt/squareup/routes/RouteBlockingServer.kt"))
-      .contains(
+    assertThat(fs.readUtf8("generated/kt/squareup/routes/RouteBlockingServer.kt")).all {
+      contains(
         "interface RouteBlockingServer : Service",
         "fun GetUpdatedRed",
       )
-      .doesNotContain("suspend fun GetUpdatedRed")
+      doesNotContain("suspend fun GetUpdatedRed")
+    }
   }
 
   @Test
@@ -182,16 +190,18 @@ class WireRunTest {
       .contains("interface RouteGetUpdatedBlueClient : Service")
     assertThat(fs.readUtf8("generated/kt/squareup/routes/RouteGetUpdatedRedClient.kt"))
       .contains("interface RouteGetUpdatedRedClient : Service")
-    assertThat(fs.readUtf8("generated/kt/squareup/routes/GrpcRouteGetUpdatedBlueClient.kt"))
-      .contains(
+    assertThat(fs.readUtf8("generated/kt/squareup/routes/GrpcRouteGetUpdatedBlueClient.kt")).all {
+      contains(
         "class GrpcRouteGetUpdatedBlueClient(\n  private val client: GrpcClient,\n) : RouteGetUpdatedBlueClient",
       )
-      .doesNotContain("RouteGetUpdatedRedClient")
-    assertThat(fs.readUtf8("generated/kt/squareup/routes/GrpcRouteGetUpdatedRedClient.kt"))
-      .contains(
+      doesNotContain("RouteGetUpdatedRedClient")
+    }
+    assertThat(fs.readUtf8("generated/kt/squareup/routes/GrpcRouteGetUpdatedRedClient.kt")).all {
+      contains(
         "class GrpcRouteGetUpdatedRedClient(\n  private val client: GrpcClient,\n) : RouteGetUpdatedRedClient",
       )
-      .doesNotContain("RouteGetUpdatedBlueClient")
+      doesNotContain("RouteGetUpdatedBlueClient")
+    }
   }
 
   @Test
@@ -290,10 +300,11 @@ class WireRunTest {
     assertThat(fs.findFiles("generated")).containsExactlyInAnyOrderAsRelativePaths(
       "generated/kt/squareup/colors/Blue.kt",
     )
-    assertThat(fs.readUtf8("generated/kt/squareup/colors/Blue.kt"))
-      .contains("class Blue")
+    assertThat(fs.readUtf8("generated/kt/squareup/colors/Blue.kt")).all {
+      contains("class Blue")
       // The type `Triangle` has been opaqued.
-      .contains("public val triangle: ByteString? = null")
+      contains("public val triangle: ByteString? = null")
+    }
   }
 
   @Test

diff --git a/wire-gradle-plugin-playground/build.gradle.kts b/wire-gradle-plugin-playground/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
   implementation(projects.wireSchema)
   implementation(projects.wireGsonSupport)
   implementation(projects.wireMoshiAdapter)
-  implementation(libs.assertj)
+  implementation(libs.assertk)
   implementation(libs.junit)
   implementation(libs.protobuf.javaUtil)
   implementation(projects.wireTestUtils)

diff --git a/wire-gradle-plugin/build.gradle.kts b/wire-gradle-plugin/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
   implementation(libs.pluginz.kotlin)
 
   testImplementation(libs.junit)
-  testImplementation(libs.assertj)
+  testImplementation(libs.assertk)
   testImplementation(projects.wireTestUtils)
 }