Fix android tests (#7464)

android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt

@@ -84,13 +84,15 @@ import javax.net.ssl.SSLPeerUnverifiedException
 import javax.net.ssl.SSLSocket
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
+import org.junit.jupiter.api.BeforeEach
 
 /**
  * Run with "./gradlew :android-test:connectedCheck" and make sure ANDROID_SDK_ROOT is set.
  */
 @ExtendWith(MockWebServerExtension::class)
 @Tag("Slow")
-class OkHttpTest(val server: MockWebServer) {
+class OkHttpTest {
+
   @Suppress("RedundantVisibilityModifier")
   @JvmField
   @RegisterExtension public val platform = PlatformRule()
@@ -109,6 +111,13 @@ class OkHttpTest(val server: MockWebServer) {
 
   private val handshakeCertificates = localhost()
 
+  private lateinit var server: MockWebServer
+
+  @BeforeEach
+  fun setup(server: MockWebServer) {
+    this.server = server
+  }
+
   @Test
   fun testPlatform() {
     assertTrue(Platform.isAndroid)

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

@@ -44,7 +44,7 @@ import org.opentest4j.TestAbortedException
  * Run with "./gradlew :android-test:connectedCheck" and make sure ANDROID_SDK_ROOT is set.
  */
 @ExtendWith(MockWebServerExtension::class)
-class AndroidAsyncDnsTest(val server: MockWebServer) {
+class AndroidAsyncDnsTest {
   private val localhostName: String = InetAddress.getByName("localhost").canonicalHostName
 
   private val localhost: HandshakeCertificates by lazy {
@@ -65,8 +65,11 @@ class AndroidAsyncDnsTest(val server: MockWebServer) {
     .sslSocketFactory(localhost.sslSocketFactory(), localhost.trustManager)
     .build()
 
+  private lateinit var server: MockWebServer
+
   @BeforeEach
-  fun init() {
+  fun init(server: MockWebServer) {
+    this.server = server
     server.useHttps(localhost.sslSocketFactory())
   }