Use assertk more

square · Dec 20, 2023 · 8f5d304 · 8f5d304
1 parent 3e06d64
commit 8f5d304
Show file tree

Hide file tree

Showing 29 changed files with 121 additions and 66 deletions.
diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
@@ -63,6 +63,7 @@ dependencies {
     exclude("org.conscrypt", "conscrypt-openjdk-uber")
     exclude("software.amazon.cryptools", "AmazonCorrettoCryptoProvider")
   }
+  androidTestImplementation(libs.assertk)
   androidTestImplementation(libs.bouncycastle.bcprov)
   androidTestImplementation(libs.bouncycastle.bctls)
   androidTestImplementation(libs.conscrypt.android)

diff --git a/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt
@@ -17,12 +17,17 @@ package okhttp.android.test.alpn;
 
 import android.os.Build
 import android.util.Log
-import java.net.InetSocketAddress
-import java.net.Proxy
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import javax.net.ssl.SSLSocket
 import javax.net.ssl.SSLSocketFactory
-import okhttp3.*
-import org.assertj.core.api.Assertions.assertThat
+import okhttp3.Call
+import okhttp3.Connection
+import okhttp3.ConnectionSpec
+import okhttp3.DelegatingSSLSocketFactory
+import okhttp3.EventListener
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 

diff --git a/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt b/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt
@@ -16,15 +16,16 @@
 package okhttp.android.test.letsencrypt;
 
 import android.os.Build
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import java.security.cert.X509Certificate
 import okhttp3.OkHttpClient
 import okhttp3.Protocol
 import okhttp3.Request
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.decodeCertificatePem
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
-import java.security.cert.X509Certificate
 
 /**
  * Test for new Let's Encrypt Root Certificate.

diff --git a/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt
@@ -17,6 +17,9 @@ package okhttp.android.test.sni;
 
 import android.os.Build
 import android.util.Log
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
 import java.security.cert.X509Certificate
 import javax.net.ssl.SNIHostName
 import javax.net.ssl.SNIServerName
@@ -28,7 +31,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Protocol
 import okhttp3.Request
 import org.junit.jupiter.api.Assumptions.assumeTrue
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 

diff --git a/mockwebserver-junit4/build.gradle.kts b/mockwebserver-junit4/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
   api(libs.junit)
 
   testImplementation(libs.assertj.core)
+  testImplementation(libs.assertk)
 }
 
 mavenPublishing {

diff --git a/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt b/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt
@@ -15,9 +15,10 @@
  */
 package mockwebserver3.junit4
 
+import assertk.assertThat
+import assertk.assertions.isTrue
 import java.net.ConnectException
 import java.util.concurrent.atomic.AtomicBoolean
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.Description
@@ -34,7 +35,7 @@ class MockWebServerRuleTest {
       }
     }, Description.EMPTY)
     statement.evaluate()
-    assertThat(called.get()).isTrue
+    assertThat(called.get()).isTrue()
     try {
       rule.server.url("/").toUrl().openConnection().connect()
       fail()

diff --git a/mockwebserver-junit5/build.gradle.kts b/mockwebserver-junit5/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
   testImplementation(libs.kotlin.junit5)
   testImplementation(projects.okhttpTestingSupport)
   testImplementation(libs.assertj.core)
+  testImplementation(libs.assertk)
 }
 
 mavenPublishing {

diff --git a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt
@@ -15,11 +15,14 @@
  */
 package mockwebserver3.junit5.internal
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isSameAs
+import assertk.assertions.isTrue
 import mockwebserver3.MockResponse
 import mockwebserver3.MockWebServer
 import okhttp3.OkHttpClientTestRule
 import okhttp3.Request
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

diff --git a/...ver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt b/...ver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt
@@ -15,8 +15,11 @@
  */
 package mockwebserver3.junit5.internal
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEqualTo
+import assertk.assertions.isTrue
 import mockwebserver3.MockWebServer
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test

diff --git a/...bserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt b/...bserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt
@@ -15,10 +15,10 @@
  */
 package mockwebserver3.junit5.internal
 
+import assertk.assertThat
+import assertk.assertions.isTrue
 import mockwebserver3.MockWebServer
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.ExtendWith
 
 @ExtendWith(MockWebServerExtension::class)

diff --git a/mockwebserver/build.gradle.kts b/mockwebserver/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
   testRuntimeOnly(projects.mockwebserver3Junit5)
   testImplementation(libs.junit)
   testImplementation(libs.assertj.core)
+  testImplementation(libs.assertk)
 }
 
 mavenPublishing {

diff --git a/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt b/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt
@@ -15,11 +15,12 @@
  */
 package mockwebserver3
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicInteger
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout

diff --git a/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt b/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt
@@ -15,6 +15,11 @@
  */
 package mockwebserver3
 
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isTrue
 import okhttp3.Dns
 import okhttp3.Headers.Companion.headersOf
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -24,7 +29,6 @@ import okhttp3.testing.PlatformRule
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import okhttp3.tls.internal.TlsUtil.localhost
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension

diff --git a/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt b/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt
@@ -15,6 +15,17 @@
  */
 package mockwebserver3
 
+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 java.io.BufferedReader
 import java.io.Closeable
 import java.io.IOException
@@ -42,8 +53,6 @@ import okhttp3.testing.PlatformRule
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import okio.Buffer
-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
@@ -371,7 +380,7 @@ class MockWebServerTest {
       i++
     }
     // Halfway +/- 0.5%
-    assertThat(i.toFloat()).isCloseTo(512f, Offset.offset(5f))
+    assertThat(i.toFloat()).isCloseTo(512f, 5f)
   }
 
   @Test
@@ -425,12 +434,12 @@ class MockWebServerTest {
 
   @Test
   fun hostnameImplicitlyStarts() {
-    assertThat(server.hostName).isNotNull
+    assertThat(server.hostName).isNotNull()
   }
 
   @Test
   fun toProxyAddressImplicitlyStarts() {
-    assertThat(server.toProxyAddress()).isNotNull
+    assertThat(server.toProxyAddress()).isNotNull()
   }
 
   @Test
@@ -491,7 +500,7 @@ class MockWebServerTest {
       refusedConnection.responseCode
       fail<Any?>("Second connection should be refused")
     } catch (e: ConnectException) {
-      assertThat(e.message).contains("refused")
+      assertThat(e.message!!).contains("refused")
     }
   }
 
@@ -579,9 +588,9 @@ class MockWebServerTest {
     val request = server.takeRequest()
     assertThat(request.requestUrl!!.scheme).isEqualTo("https")
     val handshake = request.handshake
-    assertThat(handshake!!.tlsVersion).isNotNull
-    assertThat(handshake.cipherSuite).isNotNull
-    assertThat(handshake.localPrincipal).isNotNull
+    assertThat(handshake!!.tlsVersion).isNotNull()
+    assertThat(handshake.cipherSuite).isNotNull()
+    assertThat(handshake.localPrincipal).isNotNull()
     assertThat(handshake.localCertificates.size).isEqualTo(1)
     assertThat(handshake.peerPrincipal).isNull()
     assertThat(handshake.peerCertificates.size).isEqualTo(0)
@@ -628,11 +637,11 @@ class MockWebServerTest {
     val request = server.takeRequest()
     assertThat(request.requestUrl!!.scheme).isEqualTo("https")
     val handshake = request.handshake
-    assertThat(handshake!!.tlsVersion).isNotNull
-    assertThat(handshake.cipherSuite).isNotNull
-    assertThat(handshake.localPrincipal).isNotNull
+    assertThat(handshake!!.tlsVersion).isNotNull()
+    assertThat(handshake.cipherSuite).isNotNull()
+    assertThat(handshake.localPrincipal).isNotNull()
     assertThat(handshake.localCertificates.size).isEqualTo(1)
-    assertThat(handshake.peerPrincipal).isNotNull
+    assertThat(handshake.peerPrincipal).isNotNull()
     assertThat(handshake.peerCertificates.size).isEqualTo(1)
   }
 

diff --git a/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt b/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt
@@ -16,13 +16,14 @@
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 package mockwebserver3
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import java.net.InetAddress
 import java.net.Socket
 import okhttp3.Headers
 import okhttp3.Headers.Companion.headersOf
 import okhttp3.internal.EMPTY_HEADERS
 import okio.Buffer
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout
 

diff --git a/okhttp-android/build.gradle.kts b/okhttp-android/build.gradle.kts
@@ -56,6 +56,7 @@ dependencies {
   testImplementation(libs.junit)
   testImplementation(libs.junit.ktx)
   testImplementation(libs.assertj.core)
+  testImplementation(libs.assertk)
   testImplementation(projects.okhttpTls)
   testImplementation(libs.androidx.test.runner)
   testImplementation(libs.robolectric)
@@ -64,6 +65,7 @@ dependencies {
 
   androidTestImplementation(projects.okhttpTls)
   androidTestImplementation(libs.assertj.core)
+  androidTestImplementation(libs.assertk)
   androidTestImplementation(projects.mockwebserver3Junit4)
   androidTestImplementation(libs.androidx.test.runner)
 }

diff --git a/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt b/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt
@@ -20,11 +20,16 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.os.Build
 import androidx.test.platform.app.InstrumentationRegistry
+import assertk.assertThat
+import assertk.assertions.hasMessage
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEmpty
+import assertk.assertions.isNull
 import java.net.InetAddress
 import java.net.UnknownHostException
 import java.util.concurrent.CountDownLatch
 import mockwebserver3.MockResponse
-import mockwebserver3.MockWebServer
 import mockwebserver3.junit4.MockWebServerRule
 import okhttp3.AsyncDns
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -33,9 +38,7 @@ import okhttp3.Request
 import okhttp3.tls.HandshakeCertificates
 import okhttp3.tls.HeldCertificate
 import okio.IOException
-import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.fail
-import org.junit.Assume
 import org.junit.Assume.assumeTrue
 import org.junit.AssumptionViolatedException
 import org.junit.Before
@@ -115,7 +118,7 @@ class AndroidAsyncDnsTest {
     val (allAddresses, exception) = dnsQuery("localhost")
 
     assertThat(exception).isNull()
-    assertThat(allAddresses).isNotEmpty
+    assertThat(allAddresses).isNotEmpty()
   }
 
   private fun dnsQuery(hostname: String): Pair<List<InetAddress>, Exception?> {
@@ -148,7 +151,7 @@ class AndroidAsyncDnsTest {
     val (allAddresses, exception) = dnsQuery("google.com")
 
     assertThat(exception).isNull()
-    assertThat(allAddresses).isNotEmpty
+    assertThat(allAddresses).isNotEmpty()
   }
 
   @Test

diff --git a/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt b/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt
@@ -19,22 +19,24 @@ package okhttp3.android
 import android.app.Application
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import okhttp3.CacheControl
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import java.net.InetAddress
+import java.net.UnknownHostException
+import okhttp3.Cache
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.assertj.core.api.Assertions.assertThat
+import okio.Path.Companion.toPath
+import okio.fakefilesystem.FakeFileSystem
 import org.junit.AssumptionViolatedException
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import java.net.InetAddress
-import java.net.UnknownHostException
-import okhttp3.Cache
-import okio.Path.Companion.toPath
-import okio.fakefilesystem.FakeFileSystem
 
 @RunWith(RobolectricTestRunner::class)
 @Config(

diff --git a/okhttp-brotli/build.gradle.kts b/okhttp-brotli/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
   testImplementation(libs.conscrypt.openjdk)
   testImplementation(libs.junit)
   testImplementation(libs.assertj.core)
+  testImplementation(libs.assertk)
 }
 
 mavenPublishing {