Skip to content

DeadCodeElimination-0197f05c-e337-73b3-acb2-ccfcce1ad728 #3449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DeadCodeElimination-0197f05c-e337-73b3-acb2-ccfcce1ad728 #3449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions android-test/src/test/kotlin/okhttp/android/test/RobolectricOkHttpClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
*
*/
package okhttp.android.test

import android.app.Application
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import assertk.assertThat
import assertk.assertions.isEqualTo
import assertk.assertions.isNotNull
Expand All @@ -43,12 +39,10 @@ import org.robolectric.annotation.Config
sdk = [21, 26, 30, 33, 35],
)
class RobolectricOkHttpClientTest {
private lateinit var context: Context
private lateinit var client: OkHttpClient

@Before
fun setUp() {
context = ApplicationProvider.getApplicationContext<Application>()
client =
OkHttpClient
.Builder()
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.utils.addExtendsFromRelation
import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
import java.net.URI

Expand Down
79 changes: 0 additions & 79 deletions mockwebserver-deprecated/src/test/java/okhttp3/mockwebserver/KotlinSourceModernTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,10 @@
package okhttp3.mockwebserver

import java.net.InetAddress
import java.net.Proxy
import java.net.Socket
import java.util.concurrent.TimeUnit
import javax.net.ServerSocketFactory
import javax.net.ssl.SSLSocketFactory
import okhttp3.Handshake
import okhttp3.Headers
import okhttp3.Headers.Companion.headersOf
import okhttp3.HttpUrl
import okhttp3.Protocol
import okhttp3.TlsVersion
import okhttp3.WebSocketListener
import okhttp3.internal.http2.Settings
import okio.Buffer
Expand All @@ -50,25 +43,13 @@ import org.junit.Test
class KotlinSourceModernTest {
@Test @Ignore
fun dispatcherFromMockWebServer() {
val dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse = TODO()

override fun peek(): MockResponse = TODO()

override fun shutdown() = TODO()
}
}

@Test @Ignore
fun mockResponse() {
var mockResponse: MockResponse = MockResponse()
var status: String = mockResponse.status
status = mockResponse.status
mockResponse.status = ""
mockResponse = mockResponse.setResponseCode(0)
var headers: Headers = mockResponse.headers
var trailers: Headers = mockResponse.trailers
mockResponse = mockResponse.clearHeaders()
mockResponse = mockResponse.addHeader("")
mockResponse = mockResponse.addHeader("", "")
Expand All @@ -77,86 +58,51 @@ class KotlinSourceModernTest {
mockResponse.headers = headersOf()
mockResponse.trailers = headersOf()
mockResponse = mockResponse.removeHeader("")
var body: Buffer? = mockResponse.getBody()
mockResponse = mockResponse.setBody(Buffer())
mockResponse = mockResponse.setChunkedBody(Buffer(), 0)
mockResponse = mockResponse.setChunkedBody("", 0)
var socketPolicy: SocketPolicy = mockResponse.socketPolicy
mockResponse.socketPolicy = SocketPolicy.KEEP_OPEN
var http2ErrorCode: Int = mockResponse.http2ErrorCode
mockResponse.http2ErrorCode = 0
mockResponse = mockResponse.throttleBody(0L, 0L, TimeUnit.SECONDS)
var throttleBytesPerPeriod: Long = mockResponse.throttleBytesPerPeriod
throttleBytesPerPeriod = mockResponse.throttleBytesPerPeriod
var throttlePeriod: Long = mockResponse.getThrottlePeriod(TimeUnit.SECONDS)
mockResponse = mockResponse.setBodyDelay(0L, TimeUnit.SECONDS)
val bodyDelay: Long = mockResponse.getBodyDelay(TimeUnit.SECONDS)
mockResponse = mockResponse.setHeadersDelay(0L, TimeUnit.SECONDS)
val headersDelay: Long = mockResponse.getHeadersDelay(TimeUnit.SECONDS)
mockResponse = mockResponse.withPush(PushPromise("", "", headersOf(), MockResponse()))
var pushPromises: List<PushPromise> = mockResponse.pushPromises
pushPromises = mockResponse.pushPromises
mockResponse = mockResponse.withSettings(Settings())
var settings: Settings = mockResponse.settings
settings = mockResponse.settings
mockResponse =
mockResponse.withWebSocketUpgrade(
object : WebSocketListener() {
},
)
var webSocketListener: WebSocketListener? = mockResponse.webSocketListener
webSocketListener = mockResponse.webSocketListener
}

@Test @Ignore
fun mockWebServer() {
val mockWebServer: MockWebServer = MockWebServer()
var port: Int = mockWebServer.port
var hostName: String = mockWebServer.hostName
hostName = mockWebServer.hostName
val toProxyAddress: Proxy = mockWebServer.toProxyAddress()
mockWebServer.serverSocketFactory = ServerSocketFactory.getDefault()
val url: HttpUrl = mockWebServer.url("")
mockWebServer.bodyLimit = 0L
mockWebServer.protocolNegotiationEnabled = false
mockWebServer.protocols = listOf()
val protocols: List<Protocol> = mockWebServer.protocols
mockWebServer.useHttps(SSLSocketFactory.getDefault() as SSLSocketFactory, false)
mockWebServer.noClientAuth()
mockWebServer.requestClientAuth()
mockWebServer.requireClientAuth()
val request: RecordedRequest = mockWebServer.takeRequest()
val nullableRequest: RecordedRequest? = mockWebServer.takeRequest(0L, TimeUnit.SECONDS)
var requestCount: Int = mockWebServer.requestCount
mockWebServer.enqueue(MockResponse())
mockWebServer.start()
mockWebServer.start(0)
mockWebServer.start(InetAddress.getLocalHost(), 0)
mockWebServer.shutdown()
var dispatcher: Dispatcher = mockWebServer.dispatcher
dispatcher = mockWebServer.dispatcher
mockWebServer.dispatcher = QueueDispatcher()
mockWebServer.dispatcher = QueueDispatcher()
mockWebServer.close()
}

@Test @Ignore
fun pushPromise() {
val pushPromise: PushPromise = PushPromise("", "", headersOf(), MockResponse())
val method: String = pushPromise.method
val path: String = pushPromise.path
val headers: Headers = pushPromise.headers
val response: MockResponse = pushPromise.response
}

@Test @Ignore
fun queueDispatcher() {
val queueDispatcher: QueueDispatcher = QueueDispatcher()
var mockResponse: MockResponse =
queueDispatcher.dispatch(
RecordedRequest("", headersOf(), listOf(), 0L, Buffer(), 0, Socket()),
)
mockResponse = queueDispatcher.peek()
queueDispatcher.enqueueResponse(MockResponse())
queueDispatcher.shutdown()
queueDispatcher.setFailFast(false)
Expand All @@ -165,34 +111,9 @@ class KotlinSourceModernTest {

@Test @Ignore
fun recordedRequest() {
var recordedRequest: RecordedRequest =
RecordedRequest(
"",
headersOf(),
listOf(),
0L,
Buffer(),
0,
Socket(),
)
recordedRequest = RecordedRequest("", headersOf(), listOf(), 0L, Buffer(), 0, Socket())
var requestUrl: HttpUrl? = recordedRequest.requestUrl
var requestLine: String = recordedRequest.requestLine
var method: String? = recordedRequest.method
var path: String? = recordedRequest.path
var headers: Headers = recordedRequest.headers
val header: String? = recordedRequest.getHeader("")
var chunkSizes: List<Int> = recordedRequest.chunkSizes
var bodySize: Long = recordedRequest.bodySize
var body: Buffer = recordedRequest.body
var utf8Body: String = recordedRequest.body.readUtf8()
var sequenceNumber: Int = recordedRequest.sequenceNumber
var tlsVersion: TlsVersion? = recordedRequest.tlsVersion
var handshake: Handshake? = recordedRequest.handshake
}

@Test @Ignore
fun socketPolicy() {
val socketPolicy: SocketPolicy = SocketPolicy.KEEP_OPEN
}
}
2 changes: 0 additions & 2 deletions okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/DnsRecordCodec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ internal object DnsRecordCodec {
private const val NXDOMAIN = 3
const val TYPE_A = 0x0001
const val TYPE_AAAA = 0x001c
private const val TYPE_PTR = 0x000c
private val ASCII = Charsets.US_ASCII

fun encodeQuery(
host: String,
Expand Down
5 changes: 0 additions & 5 deletions okhttp/src/jvmTest/kotlin/okhttp3/CallHandshakeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ class CallHandshakeTest {
/** Ciphers in order we observed on sslSocketFactory defaults. */
private lateinit var defaultEnabledCipherSuites: List<String>

/** Ciphers in order we observed on sslSocketFactory supported. */
private lateinit var defaultSupportedCipherSuites: List<String>

val expectedModernTls12CipherSuites =
listOf(TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384)
val expectedModernTls13CipherSuites = listOf(TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384)
Expand All @@ -83,8 +80,6 @@ class CallHandshakeTest {

defaultEnabledCipherSuites =
handshakeCertificates.sslSocketFactory().defaultCipherSuites.toList()
defaultSupportedCipherSuites =
handshakeCertificates.sslSocketFactory().supportedCipherSuites.toList()
}

@Test
Expand Down
Loading
Loading