Skip to content

Commit fdc0b8c

Browse files
Thomas Nardonefacebook-github-bot
authored andcommitted
Fix up network module tests (facebook#48160)
Summary: Shift to mockito-kotlin and fix ReactCookieJarContainerTest so it's not just testing a mock. Changelog: [Internal] Reviewed By: javache Differential Revision: D66898956
1 parent 19f3518 commit fdc0b8c

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ReactCookieJarContainerTest.kt

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,49 @@ import okhttp3.HttpUrl
1313
import org.assertj.core.api.Assertions.assertThat
1414
import org.junit.Test
1515
import org.junit.runner.RunWith
16-
import org.mockito.Mockito.any
17-
import org.mockito.Mockito.mock
18-
import org.mockito.Mockito.`when` as whenever
16+
import org.mockito.kotlin.any
17+
import org.mockito.kotlin.mock
18+
import org.mockito.kotlin.whenever
1919
import org.robolectric.RobolectricTestRunner
2020

21-
/**
22-
* Returns Mockito.any() as nullable type to avoid java.lang.IllegalStateException when null is
23-
* returned.
24-
*/
25-
private fun <T> nonNullAny(type: Class<T>): T = any(type)
26-
2721
/** Tests for {@link NetworkingModule}. */
2822
@RunWith(RobolectricTestRunner::class)
2923
class ReactCookieJarContainerTest {
3024
private val httpUrl: HttpUrl = HttpUrl.Builder().host("example.com").scheme("http").build()
3125

3226
@Test
3327
fun testMissingJar() {
34-
val jarContainer: ReactCookieJarContainer = mock(ReactCookieJarContainer::class.java)
28+
val jarContainer = ReactCookieJarContainer()
3529
assertThat(jarContainer.loadForRequest(httpUrl).size).isEqualTo(0)
3630
}
3731

3832
@Test
3933
fun testEmptyCookies() {
40-
val jarContainer: ReactCookieJarContainer = mock(ReactCookieJarContainer::class.java)
41-
val cookies: List<Cookie> = emptyList()
42-
whenever(jarContainer.loadForRequest(nonNullAny(HttpUrl::class.java))).thenReturn(cookies)
34+
val jarContainer = ReactCookieJarContainer()
35+
val cookieJar = mock<CookieJar>()
36+
jarContainer.setCookieJar(cookieJar)
37+
whenever(cookieJar.loadForRequest(any())).thenReturn(emptyList())
4338
assertThat(jarContainer.loadForRequest(httpUrl).size).isEqualTo(0)
4439
}
4540

4641
@Test
4742
fun testValidCookies() {
4843
val jarContainer = ReactCookieJarContainer()
49-
val cookieJar: CookieJar = mock(CookieJar::class.java)
44+
val cookieJar = mock<CookieJar>()
5045
jarContainer.setCookieJar(cookieJar)
51-
val cookies: MutableList<Cookie> = mutableListOf()
52-
cookies.add(Cookie.Builder().name("valid").value("valid value").domain("domain").build())
46+
val cookies =
47+
listOf(Cookie.Builder().name("valid").value("valid value").domain("domain").build())
5348
whenever(cookieJar.loadForRequest(httpUrl)).thenReturn(cookies)
5449
assertThat(jarContainer.loadForRequest(httpUrl).size).isEqualTo(1)
5550
}
5651

5752
@Test
5853
fun testInvalidCookies() {
5954
val jarContainer = ReactCookieJarContainer()
60-
val cookieJar: CookieJar = mock(CookieJar::class.java)
55+
val cookieJar = mock<CookieJar>()
6156
jarContainer.setCookieJar(cookieJar)
62-
val cookies: MutableList<Cookie> = mutableListOf()
63-
cookies.add(Cookie.Builder().name("valid").value("înválíd välūė").domain("domain").build())
57+
val cookies =
58+
listOf(Cookie.Builder().name("valid").value("înválíd välūė").domain("domain").build())
6459
whenever(cookieJar.loadForRequest(httpUrl)).thenReturn(cookies)
6560
assertThat(jarContainer.loadForRequest(httpUrl).size).isEqualTo(0)
6661
}

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ResponseUtilTest.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ import org.junit.Before
2020
import org.junit.Test
2121
import org.mockito.ArgumentCaptor
2222
import org.mockito.MockedStatic
23-
import org.mockito.Mockito.*
2423
import org.mockito.Mockito.mockStatic
24+
import org.mockito.kotlin.any
25+
import org.mockito.kotlin.mock
26+
import org.mockito.kotlin.never
27+
import org.mockito.kotlin.verify
2528

2629
class ResponseUtilTest {
2730
private lateinit var reactContext: ReactApplicationContext
2831
private lateinit var arguments: MockedStatic<Arguments>
2932

3033
@Before
3134
fun setUp() {
32-
reactContext = mock(ReactApplicationContext::class.java)
35+
reactContext = mock()
3336

3437
arguments = mockStatic(Arguments::class.java)
3538
arguments.`when`<WritableArray>(Arguments::createArray).thenAnswer { JavaOnlyArray() }
@@ -247,6 +250,6 @@ class ResponseUtilTest {
247250
ResponseUtil.onRequestSuccess(null, 1)
248251
ResponseUtil.onResponseReceived(null, 1, 200, Arguments.createMap(), "http://example.com")
249252

250-
verify(reactContext, never()).emitDeviceEvent(anyString(), any())
253+
verify(reactContext, never()).emitDeviceEvent(any<String>(), any())
251254
}
252255
}

0 commit comments

Comments
 (0)