Skip to content

Commit 72398f4

Browse files
use mockk for kotlin to fix tests
Signed-off-by: parneet-guraya <[email protected]>
1 parent ae49ba4 commit 72398f4

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import com.nhaarman.mockitokotlin2.eq
44
import com.nhaarman.mockitokotlin2.verify
55
import fr.free.nrw.commons.CommonsApplication
66
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
7+
import io.mockk.every
8+
import io.mockk.mockkObject
79
import org.junit.Before
810
import org.junit.Test
911
import org.junit.runner.RunWith
@@ -29,7 +31,6 @@ class ThanksClientTest {
2931
private lateinit var commonsApplication: CommonsApplication
3032

3133
private lateinit var thanksClient: ThanksClient
32-
private lateinit var mockedApplication: MockedStatic<CommonsApplication>
3334

3435
/**
3536
* initial setup, test environment
@@ -38,8 +39,8 @@ class ThanksClientTest {
3839
@Throws(Exception::class)
3940
fun setUp() {
4041
MockitoAnnotations.openMocks(this)
41-
mockedApplication = Mockito.mockStatic(CommonsApplication::class.java)
42-
`when`(CommonsApplication.instance).thenReturn(commonsApplication)
42+
mockkObject(CommonsApplication)
43+
every { CommonsApplication.instance }.returns(commonsApplication)
4344
thanksClient = ThanksClient(csrfTokenClient, service)
4445
}
4546

app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.os.Looper
1010
import android.view.LayoutInflater
1111
import android.view.View
1212
import androidx.recyclerview.widget.RecyclerView
13+
import fr.free.nrw.commons.CommonsApplication
1314
import fr.free.nrw.commons.Media
1415
import fr.free.nrw.commons.R
1516
import fr.free.nrw.commons.TestCommonsApplication
@@ -19,6 +20,8 @@ import fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT
1920
import fr.free.nrw.commons.settings.Prefs
2021
import fr.free.nrw.commons.upload.UploadMediaDetail
2122
import fr.free.nrw.commons.upload.UploadMediaDetailAdapter
23+
import io.mockk.every
24+
import io.mockk.mockkObject
2225
import org.junit.Assert
2326
import org.junit.Assert.assertEquals
2427
import org.junit.Before
@@ -54,6 +57,9 @@ class DescriptionEditActivityUnitTest {
5457
@Mock
5558
private lateinit var rvDescriptions: RecyclerView
5659

60+
@Mock
61+
private lateinit var commonsApplication: CommonsApplication
62+
5763
private lateinit var media: Media
5864

5965
@Before
@@ -82,6 +88,8 @@ class DescriptionEditActivityUnitTest {
8288
bundle.putString(Prefs.DESCRIPTION_LANGUAGE, "bn")
8389
bundle.putParcelable("media", media)
8490
intent.putExtras(bundle)
91+
mockkObject(CommonsApplication)
92+
every { CommonsApplication.instance }.returns(commonsApplication)
8593
activity =
8694
Robolectric.buildActivity(DescriptionEditActivity::class.java, intent).create().get()
8795
binding = ActivityDescriptionEditBinding.inflate(LayoutInflater.from(activity))

0 commit comments

Comments
 (0)