From 158c66bce25ed104bee61df939ed0d541a099f4d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 24 Dec 2022 11:52:23 +1000 Subject: [PATCH] Fix testHeadAfterPut failures (#7565) --- .../jvmTest/java/okhttp3/CallKotlinTest.kt | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt index fc9f47ce5309..71c078207a32 100644 --- a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt +++ b/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt @@ -147,15 +147,17 @@ class CallKotlinTest { .header("Content-Type", "application/xml") .put(ValidRequestBody()) .build() - // 201 - client.newCall(request).execute() + client.newCall(request).execute().use { + assertEquals(201, it.code) + } request = Request.Builder() .url(endpointUrl) .head() .build() - // 204 - client.newCall(request).execute() + client.newCall(request).execute().use { + assertEquals(204, it.code) + } request = Request.Builder() .url(endpointUrl) @@ -174,19 +176,9 @@ class CallKotlinTest { .head() .build() - client.newCall(request).execute() - - var recordedRequest = server.takeRequest() - assertEquals("PUT", recordedRequest.method) - - recordedRequest = server.takeRequest() - assertEquals("HEAD", recordedRequest.method) - - recordedRequest = server.takeRequest() - assertThat(recordedRequest.failure).isNotNull() - - recordedRequest = server.takeRequest() - assertEquals("HEAD", recordedRequest.method) + client.newCall(request).execute().use { + assertEquals(204, it.code) + } } @Test