android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-23 06:42:24 +03:00
Code Releases Activity

Fix Android instrumentation tests on API 21 (#7871)

Browse Source
This commit is contained in:
Yuri Schimke
2023-05-28 09:30:27 +01:00
committed by GitHub
parent 56ffd1bf1e
commit a05ee927eb
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt
View File

@@ -18,6 +18,7 @@ package okhttp3.android
import android.content.Context
import android.net.ConnectivityManager
import android.os.Build
import androidx.test.platform.app.InstrumentationRegistry
import java.net.InetAddress
import java.net.UnknownHostException
@@ -34,6 +35,8 @@ 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
import org.junit.Ignore
@@ -45,6 +48,7 @@ import org.junit.Test
*/
class AndroidAsyncDnsTest {
@JvmField @Rule val serverRule = MockWebServerRule()
private lateinit var client: OkHttpClient
private val localhost: HandshakeCertificates by lazy {
// Generate a self-signed cert for the server to serve and the client to trust.
@@ -58,13 +62,15 @@ class AndroidAsyncDnsTest {
.build()
}
private val client = OkHttpClient.Builder()
.dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
.sslSocketFactory(localhost.sslSocketFactory(), localhost.trustManager)
.build()
@Before
fun init() {
assumeTrue("Supported on API 29+", Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
client = OkHttpClient.Builder()
.dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
.sslSocketFactory(localhost.sslSocketFactory(), localhost.trustManager)
.build()
serverRule.server.useHttps(localhost.sslSocketFactory())
}

3
okhttp-android/src/main/kotlin/okhttp3/android/AndroidAsyncDns.kt
View File

@@ -61,7 +61,10 @@ class AndroidAsyncDns(
}
companion object {
@RequiresApi(Build.VERSION_CODES.Q)
val IPv4 = AndroidAsyncDns(dnsClass = AsyncDns.DnsClass.IPV4)
@RequiresApi(Build.VERSION_CODES.Q)
val IPv6 = AndroidAsyncDns(dnsClass = AsyncDns.DnsClass.IPV6)
}
}