Skip to content

Commit fab7c6c

Browse files
Copilotnicolas-raoul
Copilot
and
nicolas-raoul
committed
Fix unit tests: upgrade mockito-kotlin to 5.4.0 for Kotlin 2.1.0 compatibility
Co-authored-by: nicolas-raoul <99590+nicolas-raoul@users.noreply.github.com>
1 parent 4d2d30f commit fab7c6c

File tree

92 files changed

+252
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+252
-252
lines changed

‎app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import com.nhaarman.mockitokotlin2.mock
2-
import com.nhaarman.mockitokotlin2.whenever
1+
import org.mockito.kotlin.mock
2+
import org.mockito.kotlin.whenever
33
import fr.free.nrw.commons.Media
44
import fr.free.nrw.commons.category.CategoryItem
55
import fr.free.nrw.commons.location.LatLng

‎app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package fr.free.nrw.commons
22

33
import com.google.gson.Gson
4-
import com.nhaarman.mockitokotlin2.any
5-
import com.nhaarman.mockitokotlin2.verify
6-
import com.nhaarman.mockitokotlin2.times
4+
import org.mockito.kotlin.any
5+
import org.mockito.kotlin.verify
6+
import org.mockito.kotlin.times
77
import fr.free.nrw.commons.campaigns.CampaignResponseDTO
88
import fr.free.nrw.commons.campaigns.CampaignConfig
99
import fr.free.nrw.commons.campaigns.models.Campaign

‎app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.content.ContentProviderClient
55
import android.content.Context
66
import androidx.collection.LruCache
77
import com.google.gson.Gson
8-
import com.nhaarman.mockitokotlin2.mock
8+
import org.mockito.kotlin.mock
99
import fr.free.nrw.commons.data.DBOpenHelper
1010
import fr.free.nrw.commons.di.CommonsApplicationComponent
1111
import fr.free.nrw.commons.di.CommonsApplicationModule

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.free.nrw.commons.actions
22

3-
import com.nhaarman.mockitokotlin2.eq
4-
import com.nhaarman.mockitokotlin2.verify
3+
import org.mockito.kotlin.eq
4+
import org.mockito.kotlin.verify
55
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
66
import fr.free.nrw.commons.wikidata.model.edit.Edit
77
import io.reactivex.Observable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.free.nrw.commons.actions
22

3-
import com.nhaarman.mockitokotlin2.eq
4-
import com.nhaarman.mockitokotlin2.verify
3+
import org.mockito.kotlin.eq
4+
import org.mockito.kotlin.verify
55
import fr.free.nrw.commons.CommonsApplication
66
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
77
import io.mockk.every

‎app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import androidx.fragment.app.FragmentManager
1010
import androidx.fragment.app.FragmentTransaction
1111
import androidx.test.core.app.ApplicationProvider
1212
import com.google.android.material.tabs.TabLayout
13-
import com.nhaarman.mockitokotlin2.any
14-
import com.nhaarman.mockitokotlin2.times
15-
import com.nhaarman.mockitokotlin2.verify
16-
import com.nhaarman.mockitokotlin2.whenever
13+
import org.mockito.kotlin.any
14+
import org.mockito.kotlin.times
15+
import org.mockito.kotlin.verify
16+
import org.mockito.kotlin.whenever
1717
import fr.free.nrw.commons.Media
1818
import fr.free.nrw.commons.OkHttpConnectionFactory
1919
import fr.free.nrw.commons.R

‎app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fr.free.nrw.commons.bookmarks.items
22

3-
import com.nhaarman.mockitokotlin2.whenever
3+
import org.mockito.kotlin.whenever
44
import fr.free.nrw.commons.category.CategoryItem
55
import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
66
import org.junit.Assert

‎app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import android.database.MatrixCursor
77
import android.database.sqlite.SQLiteDatabase
88
import android.net.Uri
99
import android.os.RemoteException
10-
import com.nhaarman.mockitokotlin2.any
11-
import com.nhaarman.mockitokotlin2.anyOrNull
12-
import com.nhaarman.mockitokotlin2.argumentCaptor
13-
import com.nhaarman.mockitokotlin2.eq
14-
import com.nhaarman.mockitokotlin2.inOrder
15-
import com.nhaarman.mockitokotlin2.isA
16-
import com.nhaarman.mockitokotlin2.isNull
17-
import com.nhaarman.mockitokotlin2.mock
18-
import com.nhaarman.mockitokotlin2.verify
19-
import com.nhaarman.mockitokotlin2.whenever
10+
import org.mockito.kotlin.any
11+
import org.mockito.kotlin.anyOrNull
12+
import org.mockito.kotlin.argumentCaptor
13+
import org.mockito.kotlin.eq
14+
import org.mockito.kotlin.inOrder
15+
import org.mockito.kotlin.isA
16+
import org.mockito.kotlin.isNull
17+
import org.mockito.kotlin.mock
18+
import org.mockito.kotlin.verify
19+
import org.mockito.kotlin.whenever
2020
import fr.free.nrw.commons.TestCommonsApplication
2121
import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_DESCRIPTION_LIST
2222
import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_NAME_LIST

‎app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.fragment.app.FragmentManager
1010
import androidx.fragment.app.FragmentTransaction
1111
import androidx.recyclerview.widget.RecyclerView
1212
import androidx.test.core.app.ApplicationProvider
13-
import com.nhaarman.mockitokotlin2.whenever
13+
import org.mockito.kotlin.whenever
1414
import fr.free.nrw.commons.OkHttpConnectionFactory
1515
import fr.free.nrw.commons.R
1616
import fr.free.nrw.commons.TestCommonsApplication

‎app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ import android.net.Uri
99
import android.os.RemoteException
1010
import androidx.room.Room
1111
import androidx.test.core.app.ApplicationProvider
12-
import com.nhaarman.mockitokotlin2.any
13-
import com.nhaarman.mockitokotlin2.anyOrNull
14-
import com.nhaarman.mockitokotlin2.argumentCaptor
15-
import com.nhaarman.mockitokotlin2.eq
16-
import com.nhaarman.mockitokotlin2.inOrder
17-
import com.nhaarman.mockitokotlin2.isA
18-
import com.nhaarman.mockitokotlin2.isNull
19-
import com.nhaarman.mockitokotlin2.mock
20-
import com.nhaarman.mockitokotlin2.verify
21-
import com.nhaarman.mockitokotlin2.whenever
12+
import org.mockito.kotlin.any
13+
import org.mockito.kotlin.anyOrNull
14+
import org.mockito.kotlin.argumentCaptor
15+
import org.mockito.kotlin.eq
16+
import org.mockito.kotlin.inOrder
17+
import org.mockito.kotlin.isA
18+
import org.mockito.kotlin.isNull
19+
import org.mockito.kotlin.mock
20+
import org.mockito.kotlin.verify
21+
import org.mockito.kotlin.whenever
2222
import fr.free.nrw.commons.TestCommonsApplication
2323
import fr.free.nrw.commons.db.AppDatabase
2424
import fr.free.nrw.commons.location.LatLng

0 commit comments

Comments
 (0)