Switch from truth to assertk

ansman · Apr 12, 2023 · ede0f88 · ede0f88
1 parent 4e33bdf
commit ede0f88
Show file tree

Hide file tree

Showing 14 changed files with 208 additions and 95 deletions.
diff --git a/api/src/test/kotlin/se/ansman/kotshi/TestKotshiUtils.kt b/api/src/test/kotlin/se/ansman/kotshi/TestKotshiUtils.kt
@@ -1,6 +1,8 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEqualTo
 import com.squareup.moshi.JsonQualifier
 import org.junit.Test
 import se.ansman.kotshi.KotshiUtils.createJsonQualifierImplementation

diff --git a/gradle-plugin/src/main/kotlin/library.gradle.kts b/gradle-plugin/src/main/kotlin/library.gradle.kts
@@ -29,6 +29,6 @@ tasks.withType<Javadoc> { enabled = false }
 
 dependencies {
     testImplementation(libs.junit)
-    testImplementation(libs.truth)
+    testImplementation(libs.assertk)
     testImplementation(libs.kotlin.test.junit)
 }
diff --git a/gradle-plugin/src/main/kotlin/test-library.gradle.kts b/gradle-plugin/src/main/kotlin/test-library.gradle.kts
@@ -16,6 +16,7 @@ sourceSets {
 }
 
 tasks.withType<Test>().configureEach {
+    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
     jvmArgs(
         "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
         "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
@@ -28,6 +29,7 @@ tasks.withType<Test>().configureEach {
         "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
         "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
     )
+}
 
 dependencies {
     implementation(project(":api"))

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -28,7 +28,7 @@ kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin
 kotlinx-metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0"
 
 junit = "junit:junit:4.12"
-truth = "com.google.truth:truth:1.1.3"
+assertk = "com.willowtreeapps.assertk:assertk-jvm:0.25"
 
 compileTesting-core = { module = "com.github.tschuchortdev:kotlin-compile-testing", version.ref = "compileTesting" }
 compileTesting-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version.ref = "compileTesting" }

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/BaseGeneratorTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/BaseGeneratorTest.kt
diff --git a/tests/src/test/kotlin/se/ansman/kotshi/ClassWithManyPropertiesTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/ClassWithManyPropertiesTest.kt
@@ -1,6 +1,8 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isDataClassEqualTo
+import assertk.assertions.isNotNull
 import com.squareup.moshi.Moshi
 import org.junit.Test
 
@@ -13,6 +15,7 @@ class ClassWithManyPropertiesTest {
     @Test
     fun canReadJson() {
         assertThat(adapter.fromJson("{}"))
-            .isEqualTo(ClassWithManyProperties())
+            .isNotNull()
+            .isDataClassEqualTo(ClassWithManyProperties())
     }
 }
diff --git a/tests/src/test/kotlin/se/ansman/kotshi/IgnoredPropertiesTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/IgnoredPropertiesTest.kt
@@ -1,6 +1,7 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/ManuallyRegisteredAdapterTest.kt
@@ -1,6 +1,10 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotInstanceOf
+import assertk.assertions.isSameAs
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
 import org.junit.Test
@@ -18,7 +22,7 @@ class ManuallyRegisteredAdapterTest {
     @Test
     fun testRegistersRegularAdapter() {
         assertThat(moshi.adapter(ManuallyRegisteredAdapter.Type::class.java))
-            .isSameInstanceAs(ManuallyRegisteredAdapter)
+            .isSameAs(ManuallyRegisteredAdapter)
     }
 
     @OptIn(ExperimentalStdlibApi::class)
@@ -61,7 +65,6 @@ class ManuallyRegisteredAdapterTest {
         assertIs<ManuallyRegisteredGenericAdapter<*>>(adapter)
         assertSame(moshi, adapter.moshi)
         assertThat(adapter.types)
-            .asList()
             .containsExactly(Int::class.javaObjectType)
     }
 

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/SealedClassWithComplexGenericTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/SealedClassWithComplexGenericTest.kt
@@ -1,6 +1,7 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import org.junit.Test

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/SealedClassWithGenericTest.kt b/tests/src/test/kotlin/se/ansman/kotshi/SealedClassWithGenericTest.kt
@@ -1,6 +1,7 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import org.junit.Test

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/TestClassWithQualifierWithEmptyArrays.kt b/tests/src/test/kotlin/se/ansman/kotshi/TestClassWithQualifierWithEmptyArrays.kt
@@ -1,8 +1,11 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.isInstanceOf
 import com.squareup.moshi.Moshi
 import org.junit.Test
+import se.ansman.kotshi.assertions.isEmpty
 import kotlin.test.assertEquals
 
 class TestClassWithQualifierWithEmptyArrays {
@@ -21,23 +24,23 @@ class TestClassWithQualifierWithEmptyArrays {
                         val annotation = annotations.single() as QualifierWithArrays
                         assertThat(annotation.booleanArrayArg).isEmpty()
                         assertThat(annotation.byteArrayArg).isEmpty()
-                        assertThat(annotation.ubyteArrayArg).apply {
+                        assertThat(annotation.ubyteArrayArg).all {
                             isInstanceOf(UByteArray::class.java)
                             isEmpty()
                         }
                         assertThat(annotation.charArrayArg).isEmpty()
                         assertThat(annotation.shortArrayArg).isEmpty()
-                        assertThat(annotation.ushortArrayArg).apply {
+                        assertThat(annotation.ushortArrayArg).all {
                             isInstanceOf(UShortArray::class.java)
                             isEmpty()
                         }
                         assertThat(annotation.intArrayArg).isEmpty()
-                        assertThat(annotation.uintArrayArg).apply {
+                        assertThat(annotation.uintArrayArg).all {
                             isInstanceOf(UIntArray::class.java)
                             isEmpty()
                         }
                         assertThat(annotation.longArrayArg).isEmpty()
-                        assertThat(annotation.ulongArrayArg).apply {
+                        assertThat(annotation.ulongArrayArg).all {
                             isInstanceOf(ULongArray::class.java)
                             isEmpty()
                         }

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/TestQualifiersWithDefaults.kt b/tests/src/test/kotlin/se/ansman/kotshi/TestQualifiersWithDefaults.kt
@@ -1,6 +1,8 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEqualTo
 import com.squareup.moshi.Moshi
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -18,21 +20,21 @@ class TestQualifiersWithDefaults {
                     String::class.java -> {
                         ++callCount
                         val annotation = annotations.single() as QualifierWithDefaults
-                        assertThat(annotation.vararg).isEqualTo(arrayOf("vararg"))
+                        assertThat(annotation.vararg).containsExactly("vararg")
                         assertThat(annotation.string).isEqualTo("Hello")
                         moshi.adapter(String::class.java)
                     }
                     Int::class.javaObjectType -> {
                         ++callCount
                         val annotation = annotations.single() as QualifierWithDefaults
-                        assertThat(annotation.vararg).isEqualTo(arrayOf("not", "default"))
+                        assertThat(annotation.vararg).containsExactly("not", "default")
                         assertThat(annotation.string).isEqualTo("Hello")
                         moshi.adapter(Int::class.java)
                     }
                     Boolean::class.javaObjectType -> {
                         ++callCount
                         val annotation = annotations.single() as QualifierWithDefaults
-                        assertThat(annotation.vararg).isEqualTo(arrayOf("vararg"))
+                        assertThat(annotation.vararg).containsExactly("vararg")
                         assertThat(annotation.string).isEqualTo("not default")
                         moshi.adapter(Boolean::class.java)
                     }

diff --git a/tests/src/test/kotlin/se/ansman/kotshi/assertions/arrays.kt b/tests/src/test/kotlin/se/ansman/kotshi/assertions/arrays.kt
@@ -0,0 +1,72 @@
+@file:OptIn(ExperimentalUnsignedTypes::class)
+
+package se.ansman.kotshi.assertions
+
+import assertk.Assert
+import assertk.assertions.isTrue
+import assertk.assertions.prop
+
+@JvmName("isBooleanArrayEmpty")
+fun Assert<BooleanArray>.isEmpty() {
+    prop(BooleanArray::isEmpty).isTrue()
+}
+
+@JvmName("isByteArrayEmpty")
+fun Assert<ByteArray>.isEmpty() {
+    prop(ByteArray::isEmpty).isTrue()
+}
+
+@JvmName("isUByteArrayEmpty")
+fun Assert<UByteArray>.isEmpty() {
+    prop(UByteArray::isEmpty).isTrue()
+}
+
+@JvmName("isCharArrayEmpty")
+fun Assert<CharArray>.isEmpty() {
+    prop(CharArray::isEmpty).isTrue()
+}
+
+@JvmName("isShortArrayEmpty")
+fun Assert<ShortArray>.isEmpty() {
+    prop(ShortArray::isEmpty).isTrue()
+}
+
+@JvmName("isUShortArrayEmpty")
+fun Assert<UShortArray>.isEmpty() {
+    prop(UShortArray::isEmpty).isTrue()
+}
+
+@JvmName("isIntArrayEmpty")
+fun Assert<IntArray>.isEmpty() {
+    prop(IntArray::isEmpty).isTrue()
+}
+
+@JvmName("isUIntArrayEmpty")
+fun Assert<UIntArray>.isEmpty() {
+    prop(UIntArray::isEmpty).isTrue()
+}
+
+@JvmName("isLongArrayEmpty")
+fun Assert<LongArray>.isEmpty() {
+    prop(LongArray::isEmpty).isTrue()
+}
+
+@JvmName("isULongArrayEmpty")
+fun Assert<ULongArray>.isEmpty() {
+    prop(ULongArray::isEmpty).isTrue()
+}
+
+@JvmName("isFloatArrayEmpty")
+fun Assert<FloatArray>.isEmpty() {
+    prop(FloatArray::isEmpty).isTrue()
+}
+
+@JvmName("isDoubleArrayEmpty")
+fun Assert<DoubleArray>.isEmpty() {
+    prop(DoubleArray::isEmpty).isTrue()
+}
+
+@JvmName("isArrayEmpty")
+fun Assert<Array<*>>.isEmpty() {
+    prop(Array<*>::isEmpty).isTrue()
+}
diff --git a/tests/src/test/kotlin/se/ansman/kotshi/assertions/classes.kt b/tests/src/test/kotlin/se/ansman/kotshi/assertions/classes.kt
@@ -0,0 +1,16 @@
+package se.ansman.kotshi.assertions
+
+import assertk.Assert
+import assertk.assertions.support.expected
+
+inline fun <reified T : Any> Assert<Class<*>>.isAssignableTo() {
+    isAssignableTo(T::class.java)
+}
+
+fun Assert<Class<*>>.isAssignableTo(other: Class<*>) {
+    given {
+        if (!other.isAssignableFrom(it)) {
+            expected("$it to be assignable to $other")
+        }
+    }
+}