Stop using AssertJ (square#8174)

* Stop using AssertJ

This completes the migration to assertk.

* Fix a missing import

* Fix some type issues

Author: squarejesse

gradle/libs.versions.toml

@@ -21,7 +21,6 @@ androidx-junit = "androidx.test.ext:junit:1.1.5"
 androidx-test-runner = "androidx.test:runner:1.5.2"
 animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
 aqute-resolve = { module = "biz.aQute.bnd:biz.aQute.resolve", version.ref = "biz-aQute-bnd" }
-assertj-core = "org.assertj:assertj-core:3.24.2"
 assertk = "com.willowtreeapps.assertk:assertk:0.27.0"
 bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "org-bouncycastle" }
 bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "org-bouncycastle" }

mockwebserver-deprecated/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
 
   testImplementation(projects.okhttpTestingSupport)
   testImplementation(projects.okhttpTls)
-  testImplementation(libs.assertj.core)
 }
 
 mavenPublishing {

mockwebserver-deprecated/src/test/java/okhttp3/mockwebserver/MockWebServerTest.kt

@@ -15,6 +15,18 @@
  */
 package okhttp3.mockwebserver
 
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.containsExactly
+import assertk.assertions.isBetween
+import assertk.assertions.isCloseTo
+import assertk.assertions.isEqualTo
+import assertk.assertions.isGreaterThan
+import assertk.assertions.isGreaterThanOrEqualTo
+import assertk.assertions.isNotEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import assertk.assertions.isTrue
 import java.io.BufferedReader
 import java.io.Closeable
 import java.io.IOException
@@ -35,8 +47,6 @@ import okhttp3.TestUtil.assumeNotWindows
 import okhttp3.testing.PlatformRule
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.data.Offset
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.fail
 import org.junit.jupiter.api.BeforeEach
@@ -354,7 +364,7 @@ class MockWebServerTest {
       i++
     }
     // Halfway +/- 0.5%
-    assertThat(i.toFloat()).isCloseTo(512f, Offset.offset(5f))
+    assertThat(i.toFloat()).isCloseTo(512f, 5f)
   }
 
   @Test
@@ -494,7 +504,7 @@ class MockWebServerTest {
       refusedConnection.getResponseCode()
       fail<Any>("Second connection should be refused")
     } catch (e: ConnectException) {
-      assertThat(e.message).contains("refused")
+      assertThat(e.message!!).contains("refused")
     }
   }
 

mockwebserver-junit4/build.gradle.kts

@@ -18,7 +18,6 @@ dependencies {
   api(projects.mockwebserver3)
   api(libs.junit)
 
-  testImplementation(libs.assertj.core)
   testImplementation(libs.assertk)
 }
 

mockwebserver-junit5/build.gradle.kts

@@ -26,10 +26,8 @@ dependencies {
   compileOnly(libs.animalsniffer.annotations)
 
   testRuntimeOnly(libs.junit.jupiter.engine)
-  testImplementation(libs.assertj.core)
   testImplementation(libs.kotlin.junit5)
   testImplementation(projects.okhttpTestingSupport)
-  testImplementation(libs.assertj.core)
   testImplementation(libs.assertk)
 }
 

mockwebserver/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
   testImplementation(projects.okhttpTls)
   testRuntimeOnly(projects.mockwebserver3Junit5)
   testImplementation(libs.junit)
-  testImplementation(libs.assertj.core)
   testImplementation(libs.assertk)
 }
 

native-image-tests/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.assertj.core)
   implementation(libs.junit.jupiter.api)
   implementation(libs.junit.jupiter.engine)
   implementation(libs.junit.platform.console)
@@ -19,7 +18,6 @@ dependencies {
   implementation(projects.okhttpSse)
   implementation(projects.okhttpTestingSupport)
   implementation(projects.okhttpTls)
-  implementation(libs.assertj.core)
   implementation(projects.mockwebserver3)
   implementation(projects.mockwebserver)
   implementation(projects.okhttpJavaNetCookiejar)

native-image-tests/src/main/kotlin/okhttp3/SampleTest.kt

@@ -15,10 +15,11 @@
  */
 package okhttp3
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.assertj.core.api.AssertionsForClassTypes.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.params.ParameterizedTest

okhttp-android/build.gradle.kts

@@ -57,7 +57,6 @@ dependencies {
 
   testImplementation(libs.junit)
   testImplementation(libs.junit.ktx)
-  testImplementation(libs.assertj.core)
   testImplementation(libs.assertk)
   testImplementation(projects.okhttpTls)
   testImplementation(libs.androidx.test.runner)
@@ -66,7 +65,6 @@ dependencies {
   testImplementation(libs.squareup.okio.fakefilesystem)
 
   androidTestImplementation(projects.okhttpTls)
-  androidTestImplementation(libs.assertj.core)
   androidTestImplementation(libs.assertk)
   androidTestImplementation(projects.mockwebserver3Junit4)
   androidTestImplementation(libs.androidx.test.runner)

okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt

@@ -26,6 +26,7 @@ import assertk.assertions.isEmpty
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNotEmpty
 import assertk.assertions.isNull
+import assertk.fail
 import java.net.InetAddress
 import java.net.UnknownHostException
 import java.util.concurrent.CountDownLatch
@@ -38,7 +39,6 @@ import okhttp3.Request
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import okio.IOException
-import org.assertj.core.api.Assertions.fail
 import org.junit.Assume.assumeTrue
 import org.junit.AssumptionViolatedException
 import org.junit.Before