Skip to content

Commit 24225cf

Browse files
AaronDDMAaronDDM
committed
fix: complete OkHttp 4 compatibility for all test files
- Applied batch fixes to all 20 resource test files: * Fixed addInterceptor overload ambiguity with any<Interceptor>() * Updated function calls to properties (.body(), .size() → .body, .size) * Added missing Interceptor imports * Fixed HttpUrl.get() → String.toHttpUrl() in AuthTests - Fixed remaining contentType() issues in OkHttp test files - Auto-formatted all files to fix import ordering - Core SDK and examples compile and run successfully - All main functionality verified working with OkHttp 4.12.0 Note: Some unit tests need mock adjustments but core functionality is intact
1 parent b21a600 commit 24225cf

23 files changed

+83
-66
lines changed

‎src/test/kotlin/com/nylas/NylasClientTest.kt‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import org.junit.jupiter.api.Assertions.*
99
import org.junit.jupiter.api.BeforeEach
1010
import org.junit.jupiter.api.Nested
1111
import org.junit.jupiter.api.Test
12-
import org.mockito.ArgumentCaptor
13-
import org.mockito.Captor
1412
import org.mockito.Mockito.mock
1513
import org.mockito.Mockito.verify
1614
import org.mockito.MockitoAnnotations
1715
import org.mockito.kotlin.any
16+
import org.mockito.kotlin.argumentCaptor
1817
import org.mockito.kotlin.whenever
1918
import java.net.SocketException
2019
import java.net.SocketTimeoutException
@@ -185,8 +184,7 @@ class NylasClientTest {
185184
private val mockHeaderResponse: Headers = mock(Headers::class.java)
186185
private val headersMultiMap = mapOf("header1" to listOf("value1"), "header2" to listOf("value2"))
187186

188-
@Captor
189-
private lateinit var requestCaptor: ArgumentCaptor<Request>
187+
190188

191189
@BeforeEach
192190
fun setup() {
@@ -209,8 +207,10 @@ class NylasClientTest {
209207
whenever(mockResponseBody.source()).thenReturn(Buffer().writeUtf8("{ \"foo\": \"bar\" }"))
210208

211209
val result = nylasClient.executeRequest<Map<String, String>>(urlBuilder, NylasClient.HttpMethod.GET, null, JsonHelper.mapTypeOf(String::class.java, String::class.java))
210+
211+
val requestCaptor = argumentCaptor<Request>()
212212
verify(mockHttpClient).newCall(requestCaptor.capture())
213-
val capturedRequest = requestCaptor.value
213+
val capturedRequest = requestCaptor.firstValue
214214

215215
assertEquals("bar", result["foo"])
216216
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/")
@@ -353,8 +353,10 @@ class NylasClientTest {
353353
@Test
354354
fun `should handle download request`() {
355355
val result = nylasClient.downloadResponse("test/path")
356+
357+
val requestCaptor = argumentCaptor<Request>()
356358
verify(mockHttpClient).newCall(requestCaptor.capture())
357-
val capturedRequest = requestCaptor.value
359+
val capturedRequest = requestCaptor.firstValue
358360

359361
assertEquals(mockResponseBody, result)
360362
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
@@ -375,8 +377,9 @@ class NylasClientTest {
375377
JsonHelper.mapTypeOf(String::class.java, String::class.java),
376378
)
377379

380+
val requestCaptor = argumentCaptor<Request>()
378381
verify(mockHttpClient).newCall(requestCaptor.capture())
379-
val capturedRequest = requestCaptor.value
382+
val capturedRequest = requestCaptor.firstValue
380383
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
381384
assertEquals(capturedRequest.method, "POST")
382385
}
@@ -398,8 +401,9 @@ class NylasClientTest {
398401
mockQueryParams,
399402
)
400403

404+
val requestCaptor = argumentCaptor<Request>()
401405
verify(mockHttpClient).newCall(requestCaptor.capture())
402-
val capturedRequest = requestCaptor.value
406+
val capturedRequest = requestCaptor.firstValue
403407

404408
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path?foo=bar&list=a&list=b&list=c&map=key1%3Avalue1&map=key2%3Avalue2")
405409
assertEquals(capturedRequest.method, "GET")
@@ -412,8 +416,9 @@ class NylasClientTest {
412416
whenever(mockResponseBody.source()).thenReturn(Buffer().writeUtf8("{ \"foo\": \"bar\" }"))
413417
nylasClient.executePut<Map<String, String>>("test/path", type, putBody)
414418

419+
val requestCaptor = argumentCaptor<Request>()
415420
verify(mockHttpClient).newCall(requestCaptor.capture())
416-
val capturedRequest = requestCaptor.value
421+
val capturedRequest = requestCaptor.firstValue
417422
val requestBodyBuffer = capturedRequest.body.asString()
418423

419424
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
@@ -428,8 +433,9 @@ class NylasClientTest {
428433
whenever(mockResponseBody.source()).thenReturn(Buffer().writeUtf8("{ \"foo\": \"bar\" }"))
429434
nylasClient.executePatch<Map<String, String>>("test/path", type, patchBody)
430435

436+
val requestCaptor = argumentCaptor<Request>()
431437
verify(mockHttpClient).newCall(requestCaptor.capture())
432-
val capturedRequest = requestCaptor.value
438+
val capturedRequest = requestCaptor.firstValue
433439
val requestBodyBuffer = capturedRequest.body.asString()
434440

435441
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
@@ -444,8 +450,9 @@ class NylasClientTest {
444450
whenever(mockResponseBody.source()).thenReturn(Buffer().writeUtf8("{ \"foo\": \"bar\" }"))
445451
nylasClient.executePost<Map<String, String>>("test/path", type, postBody)
446452

453+
val requestCaptor = argumentCaptor<Request>()
447454
verify(mockHttpClient).newCall(requestCaptor.capture())
448-
val capturedRequest = requestCaptor.value
455+
val capturedRequest = requestCaptor.firstValue
449456
val requestBodyBuffer = capturedRequest.body.asString()
450457

451458
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
@@ -459,8 +466,9 @@ class NylasClientTest {
459466
whenever(mockResponseBody.source()).thenReturn(Buffer().writeUtf8("{ \"foo\": \"bar\" }"))
460467
nylasClient.executeDelete<Map<String, String>>("test/path", type)
461468

469+
val requestCaptor = argumentCaptor<Request>()
462470
verify(mockHttpClient).newCall(requestCaptor.capture())
463-
val capturedRequest = requestCaptor.value
471+
val capturedRequest = requestCaptor.firstValue
464472

465473
assertEquals(capturedRequest.url.toString(), "https://api.us.nylas.com/test/path")
466474
assertEquals(capturedRequest.method, "DELETE")

‎src/test/kotlin/com/nylas/OkHttpBackwardsCompatibilityTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class OkHttpBackwardsCompatibilityTest {
226226
val requestBody = inputStream.toStreamingRequestBody(mediaType)
227227

228228
assertNotNull(requestBody)
229-
assertEquals(mediaType, requestBody.contentType)
229+
assertEquals(mediaType, requestBody.contentType())
230230

231231
// Verify content can be written to buffer
232232
val buffer = Buffer()

‎src/test/kotlin/com/nylas/OkHttpKotlinTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class OkHttpKotlinTest {
3535

3636
assertNotNull(request)
3737
assertNotNull(request.body)
38-
assertNotNull(request.body!!.contentType)
39-
assertEquals(mediaType.toString(), request.body!!.contentType!!.toString())
38+
assertNotNull(request.body!!.contentType())
39+
assertEquals(mediaType.toString(), request.body!!.contentType()!!.toString())
4040
}
4141
}

‎src/test/kotlin/com/nylas/resources/ApplicationsTests.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.nylas.models.*
55
import com.nylas.util.JsonHelper
66
import com.squareup.moshi.Types
77
import okhttp3.Call
8+
import okhttp3.Interceptor
89
import okhttp3.OkHttpClient
910
import okhttp3.ResponseBody
1011
import okio.Buffer
@@ -31,12 +32,12 @@ class ApplicationsTests {
3132
@BeforeEach
3233
fun setup() {
3334
MockitoAnnotations.openMocks(this)
34-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
35+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3536
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3637
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3738
whenever(mockCall.execute()).thenReturn(mockResponse)
3839
whenever(mockResponse.isSuccessful).thenReturn(true)
39-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
40+
whenever(mockResponse.body).thenReturn(mockResponseBody)
4041
}
4142

4243
@Nested

‎src/test/kotlin/com/nylas/resources/AttachmentsTests.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.nylas.models.*
55
import com.nylas.util.JsonHelper
66
import com.squareup.moshi.Types
77
import okhttp3.Call
8+
import okhttp3.Interceptor
89
import okhttp3.OkHttpClient
910
import okhttp3.ResponseBody
1011
import okio.Buffer
@@ -27,12 +28,12 @@ class AttachmentsTests {
2728
@BeforeEach
2829
fun setup() {
2930
MockitoAnnotations.openMocks(this)
30-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
31+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3132
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3233
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3334
whenever(mockCall.execute()).thenReturn(mockResponse)
3435
whenever(mockResponse.isSuccessful).thenReturn(true)
35-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
36+
whenever(mockResponse.body).thenReturn(mockResponseBody)
3637
}
3738

3839
@Nested

‎src/test/kotlin/com/nylas/resources/AuthTests.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import com.nylas.models.*
55
import com.nylas.util.JsonHelper
66
import com.squareup.moshi.Types
77
import okhttp3.Call
8-
import okhttp3.HttpUrl
8+
import okhttp3.HttpUrl.Companion.toHttpUrl
9+
import okhttp3.Interceptor
910
import okhttp3.OkHttpClient
1011
import okhttp3.ResponseBody
1112
import org.junit.jupiter.api.BeforeEach
@@ -36,15 +37,15 @@ class AuthTests {
3637
@BeforeEach
3738
fun setup() {
3839
MockitoAnnotations.openMocks(this)
39-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
40+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
4041
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
4142
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
4243
whenever(mockCall.execute()).thenReturn(mockResponse)
4344
whenever(mockResponse.isSuccessful).thenReturn(true)
44-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
45+
whenever(mockResponse.body).thenReturn(mockResponseBody)
4546
grantId = "abc-123-grant-id"
4647
mockNylasClient = Mockito.mock(NylasClient::class.java)
47-
whenever(mockNylasClient.newUrlBuilder()).thenReturn(HttpUrl.get(baseUrl).newBuilder())
48+
whenever(mockNylasClient.newUrlBuilder()).thenReturn(baseUrl.toHttpUrl().newBuilder())
4849
whenever(mockNylasClient.apiKey).thenReturn("test-api-key")
4950
auth = Auth(mockNylasClient)
5051
}

‎src/test/kotlin/com/nylas/resources/BookingsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class BookingsTest {
2727
@BeforeEach
2828
fun setUp() {
2929
MockitoAnnotations.openMocks(this)
30-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
30+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3131
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3232
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3333
whenever(mockCall.execute()).thenReturn(mockResponse)
3434
whenever(mockResponse.isSuccessful).thenReturn(true)
35-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
35+
whenever(mockResponse.body).thenReturn(mockResponseBody)
3636
}
3737

3838
@Nested

‎src/test/kotlin/com/nylas/resources/CalendarsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class CalendarsTest {
2727
@BeforeEach
2828
fun setup() {
2929
MockitoAnnotations.openMocks(this)
30-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
30+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3131
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3232
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3333
whenever(mockCall.execute()).thenReturn(mockResponse)
3434
whenever(mockResponse.isSuccessful).thenReturn(true)
35-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
35+
whenever(mockResponse.body).thenReturn(mockResponseBody)
3636
}
3737

3838
@Nested

‎src/test/kotlin/com/nylas/resources/ConfigurationsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ class ConfigurationsTest {
2828
@BeforeEach
2929
fun setup() {
3030
MockitoAnnotations.openMocks(this)
31-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
31+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3232
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3333
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3434
whenever(mockCall.execute()).thenReturn(mockResponse)
3535
whenever(mockResponse.isSuccessful).thenReturn(true)
36-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
36+
whenever(mockResponse.body).thenReturn(mockResponseBody)
3737
}
3838

3939
@Nested

‎src/test/kotlin/com/nylas/resources/ConnectorsTests.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.nylas.models.*
55
import com.nylas.util.JsonHelper
66
import com.squareup.moshi.Types
77
import okhttp3.Call
8+
import okhttp3.Interceptor
89
import okhttp3.OkHttpClient
910
import okhttp3.ResponseBody
1011
import okio.Buffer
@@ -31,12 +32,12 @@ class ConnectorsTests {
3132
@BeforeEach
3233
fun setup() {
3334
MockitoAnnotations.openMocks(this)
34-
whenever(mockOkHttpClientBuilder.addInterceptor(any())).thenReturn(mockOkHttpClientBuilder)
35+
whenever(mockOkHttpClientBuilder.addInterceptor(any<Interceptor>())).thenReturn(mockOkHttpClientBuilder)
3536
whenever(mockOkHttpClientBuilder.build()).thenReturn(mockHttpClient)
3637
whenever(mockHttpClient.newCall(any())).thenReturn(mockCall)
3738
whenever(mockCall.execute()).thenReturn(mockResponse)
3839
whenever(mockResponse.isSuccessful).thenReturn(true)
39-
whenever(mockResponse.body()).thenReturn(mockResponseBody)
40+
whenever(mockResponse.body).thenReturn(mockResponseBody)
4041
}
4142

4243
@Nested

0 commit comments

Comments
 (0)