From 3ac7098b1280c68aac3ffa0da40e9240cdec5f02 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:05:30 +0000 Subject: [PATCH 1/6] Initial plan From 16aee471ea74b57e202e57075f06270b8ed85f58 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:13:13 +0000 Subject: [PATCH 2/6] Update Kotlin to 2.1.0 and add Compose compiler plugin Co-authored-by: nicolas-raoul <99590+nicolas-raoul@users.noreply.github.com> --- app/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 41788128c7..b5accc5d9d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.kotlin.kapt) alias(libs.plugins.kotlin.parcelize) + alias(libs.plugins.compose.compiler) } apply(from = "$rootDir/jacoco.gradle") @@ -182,9 +183,6 @@ android { compose = true } buildToolsVersion = buildToolsVersion - composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" - } packaging { jniLibs { excludes += listOf("META-INF/androidx.*") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a4dd53cb2..3ff38d26ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.0" +agp = "8.3.0" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" @@ -11,7 +11,7 @@ annotation = "1.3.0" browser = "1.3.0" cardview = "1.0.0" commonsIo = "2.6" -composeBom = "2024.11.00" +composeBom = "2025.01.00" constraintlayout = "1.1.3" coordinates2country = "1.8" dexcount = "4.0.0" @@ -33,7 +33,7 @@ glide = "4.12.0" gson = "2.8.5" junit = "4.13.2" junitJupiter = "5.10.0" -kotlin = "1.9.22" +kotlin = "2.1.0" kotlinStdlib = "1.8.0" coroutines = "1.7.3" leakcanary = "2.10" @@ -208,5 +208,6 @@ android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } github-triplet-play = { id = "com.github.triplet.play", version.ref = "githubTripletPlay" } getkeepsafe-dexcount = { id = "com.getkeepsafe.dexcount", version.ref = "dexcount" } \ No newline at end of file From 0c3004ed7c351b3f6970fb7e25c8364c93ec01c0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 5 Nov 2025 14:14:47 +0000 Subject: [PATCH 3/6] Adjust AGP and Compose BOM versions to valid releases Co-authored-by: nicolas-raoul <99590+nicolas-raoul@users.noreply.github.com> --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ff38d26ef..4c0f3ea553 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.3.0" +agp = "8.3.2" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" @@ -11,7 +11,7 @@ annotation = "1.3.0" browser = "1.3.0" cardview = "1.0.0" commonsIo = "2.6" -composeBom = "2025.01.00" +composeBom = "2024.12.00" constraintlayout = "1.1.3" coordinates2country = "1.8" dexcount = "4.0.0" From c8304fa40189efa201a2732186548df8f6392b61 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Wed, 5 Nov 2025 23:24:34 +0900 Subject: [PATCH 4/6] Update libs.versions.toml --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c0f3ea553..95be2d966e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.3.2" +agp = "8.13.0" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" @@ -210,4 +210,4 @@ kotlin-kapt = { id = "org.jetbrains.kotlin.kapt" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } github-triplet-play = { id = "com.github.triplet.play", version.ref = "githubTripletPlay" } -getkeepsafe-dexcount = { id = "com.getkeepsafe.dexcount", version.ref = "dexcount" } \ No newline at end of file +getkeepsafe-dexcount = { id = "com.getkeepsafe.dexcount", version.ref = "dexcount" } From fab7c6c3369aa9c78d5c9d8ef67c1bc227376be5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 5 Nov 2025 16:34:46 +0000 Subject: [PATCH 5/6] 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> --- .../fr/free/nrw/commons/ModelFunctions.kt | 4 ++-- .../nrw/commons/OkHttpJsonApiClientTests.kt | 6 +++--- .../nrw/commons/TestCommonsApplication.kt | 2 +- .../nrw/commons/actions/PageEditClientTest.kt | 4 ++-- .../nrw/commons/actions/ThanksClientTest.kt | 4 ++-- .../BookmarkListRootFragmentUnitTest.kt | 8 ++++---- .../items/BookmarkItemsControllerTest.kt | 2 +- .../bookmarks/items/BookmarkItemsDaoTest.kt | 20 +++++++++---------- .../items/BookmarkItemsFragmentUnitTest.kt | 2 +- .../locations/BookMarkLocationDaoTest.kt | 20 +++++++++---------- .../BookmarkLocationControllerTest.kt | 2 +- .../BookmarkLocationFragmentUnitTests.kt | 4 ++-- .../pictures/BookmarkPictureDaoTest.kt | 20 +++++++++---------- .../BookmarkPicturesControllerTest.kt | 2 +- .../BookmarkPicturesFragmentUnitTests.kt | 6 +++--- .../campaigns/CampaignsPresenterTest.kt | 2 +- .../commons/category/CategoriesModelTest.kt | 10 +++++----- .../commons/category/CategoryClientTest.kt | 4 ++-- .../nrw/commons/category/CategoryDaoTest.kt | 20 +++++++++---------- .../ContributionBoundaryCallbackTest.kt | 4 ++-- .../ContributionsListPresenterTest.kt | 2 +- .../ContributionsPresenterTest.kt | 2 +- .../ContributionsRepositoryTest.kt | 6 +++--- .../helper/OnSwipeTouchListenerTest.kt | 2 +- .../ui/adapter/FolderAdapterTest.kt | 4 ++-- .../ui/adapter/ImageAdapterTest.kt | 2 +- .../ui/selector/ImageFileLoaderTest.kt | 8 ++++---- .../ui/selector/ImageFragmentTest.kt | 2 +- .../ui/selector/ImageLoaderTest.kt | 4 ++-- .../nrw/commons/delete/DeleteHelperTest.kt | 8 ++++---- .../explore/BasePagingPresenterTest.kt | 6 +++--- .../explore/ExploreFragmentUnitTest.kt | 2 +- .../ExploreListRootFragmentUnitTest.kt | 4 ++-- .../explore/PageableBaseDataSourceTest.kt | 12 +++++------ .../explore/PagingDataSourceFactoryTest.kt | 6 +++--- .../commons/explore/PagingDataSourceTest.kt | 10 +++++----- .../PageableSearchCategoriesDataSourceTest.kt | 4 ++-- .../PageableCategoriesMediaDataSourceTest.kt | 6 +++--- .../PageableParentCategoriesDataSourceTest.kt | 6 +++--- .../PageableSubCategoriesDataSourceTest.kt | 6 +++--- .../explore/depictions/DepictsClientTest.kt | 4 ++-- .../PageableDepictionsDataSourceTest.kt | 4 ++-- .../PageableChildDepictionsDataSourceTest.kt | 2 +- .../PageableDepictedMediaDataSourceTest.kt | 4 ++-- .../PageableParentDepictionsDataSourceTest.kt | 2 +- .../media/PageableMediaDataSourceTest.kt | 4 ++-- .../recentsearches/RecentSearchesDaoTest.kt | 20 +++++++++---------- .../RecentSearchesFragmentUnitTest.kt | 2 +- .../explore/search/SearchActivityUnitTests.kt | 2 +- .../commons/feedback/FeedbackDialogTests.kt | 2 +- .../nrw/commons/filepicker/FilePickerTest.kt | 6 +++--- .../nrw/commons/kvstore/BasicKvStoreTest.kt | 6 +++--- .../nrw/commons/kvstore/JsonKvStoreTest.kt | 6 +++--- .../LocationPickerActivityUnitTests.kt | 4 ++-- .../LocationPickerViewModelUnitTests.kt | 8 ++++---- .../CustomOkHttpNetworkFetcherUnitTest.kt | 6 +++--- .../free/nrw/commons/media/MediaClientTest.kt | 4 ++-- .../media/MediaDetailFragmentUnitTests.kt | 4 ++-- .../MediaDetailPagerFragmentUnitTests.kt | 10 +++++----- .../MultiPointerGestureDetectorUnitTest.kt | 6 +++--- .../TransformGestureDetectorUnitTest.kt | 4 ++-- .../commons/nearby/CheckBoxTriStatesTest.kt | 2 +- .../commons/nearby/NearbyControllerTest.kt | 6 +++--- .../NearbyParentFragmentPresenterTest.kt | 6 +++--- .../nearby/NearbyParentFragmentUnitTest.kt | 4 ++-- .../nrw/commons/nearby/NearbyPlacesTest.kt | 8 ++++---- .../nrw/commons/quiz/QuizCheckerUnitTest.kt | 2 +- .../RecentLanguagesDaoUnitTest.kt | 10 +++++----- .../nrw/commons/review/ReviewActivityTest.kt | 2 +- .../commons/review/ReviewControllerTest.kt | 4 ++-- .../nrw/commons/review/ReviewHelperTest.kt | 2 +- .../commons/review/ReviewImageFragmentTest.kt | 2 +- .../settings/SettingsFragmentUnitTests.kt | 8 ++++---- .../commons/upload/CategoriesPresenterTest.kt | 10 +++++----- .../commons/upload/DepictsPresenterTest.kt | 6 +++--- .../upload/MediaLicensePresenterTest.kt | 2 +- .../nrw/commons/upload/UploadClientTest.kt | 14 ++++++------- .../commons/upload/UploadControllerTest.kt | 4 ++-- .../UploadMediaDetailAdapterUnitTest.kt | 8 ++++---- .../upload/UploadMediaPresenterTest.kt | 8 ++++---- .../nrw/commons/upload/UploadPresenterTest.kt | 2 +- .../upload/UploadRepositoryUnitTest.kt | 8 ++++---- .../depicts/DepictEditHelperUnitTest.kt | 2 +- .../depicts/DepictsFragmentUnitTests.kt | 2 +- .../UploadMediaDetailFragmentUnitTest.kt | 2 +- .../free/nrw/commons/utils/FileUtilsTest.kt | 2 +- .../commons/utils/MediaAttributionUtilTest.kt | 2 +- .../free/nrw/commons/utils/PagedListMock.kt | 2 +- .../wikidata/WikiBaseClientUnitTest.kt | 2 +- .../commons/wikidata/WikidataClientTest.kt | 2 +- .../wikidata/WikidataEditServiceTest.kt | 6 +++--- gradle/libs.versions.toml | 6 +++--- 92 files changed, 252 insertions(+), 252 deletions(-) diff --git a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt index a3a201d948..bfeb0fdc11 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt @@ -1,5 +1,5 @@ -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.category.CategoryItem import fr.free.nrw.commons.location.LatLng diff --git a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt index 1a9d1500b5..b14642f939 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt @@ -1,9 +1,9 @@ package fr.free.nrw.commons import com.google.gson.Gson -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.times +import org.mockito.kotlin.any +import org.mockito.kotlin.verify +import org.mockito.kotlin.times import fr.free.nrw.commons.campaigns.CampaignResponseDTO import fr.free.nrw.commons.campaigns.CampaignConfig import fr.free.nrw.commons.campaigns.models.Campaign diff --git a/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt b/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt index c0e3bda083..bfc21e447e 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt @@ -5,7 +5,7 @@ import android.content.ContentProviderClient import android.content.Context import androidx.collection.LruCache import com.google.gson.Gson -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import fr.free.nrw.commons.data.DBOpenHelper import fr.free.nrw.commons.di.CommonsApplicationComponent import fr.free.nrw.commons.di.CommonsApplicationModule diff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt index d98515c96a..d457b9ea3f 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.actions -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.eq +import org.mockito.kotlin.verify import fr.free.nrw.commons.auth.csrf.CsrfTokenClient import fr.free.nrw.commons.wikidata.model.edit.Edit import io.reactivex.Observable diff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt index b3fb19c104..2cab5e840d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.actions -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.eq +import org.mockito.kotlin.verify import fr.free.nrw.commons.CommonsApplication import fr.free.nrw.commons.auth.csrf.CsrfTokenClient import io.mockk.every diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt index c2c33667b6..212f28fcd1 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/BookmarkListRootFragmentUnitTest.kt @@ -10,10 +10,10 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider import com.google.android.material.tabs.TabLayout -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt index 38bf6b2678..0226bfd209 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsControllerTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.bookmarks.items -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.category.CategoryItem import fr.free.nrw.commons.upload.structure.depictions.DepictedItem import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt index e7ecbe0747..a5392eebb1 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt @@ -7,16 +7,16 @@ import android.database.MatrixCursor import android.database.sqlite.SQLiteDatabase import android.net.Uri import android.os.RemoteException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.isA +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_DESCRIPTION_LIST import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_NAME_LIST diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt index 086fd703be..e64bc86675 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragmentUnitTest.kt @@ -10,7 +10,7 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt index 4808d85188..b20fd8f30d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt @@ -9,16 +9,16 @@ import android.net.Uri import android.os.RemoteException import androidx.room.Room import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.isA +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.db.AppDatabase import fr.free.nrw.commons.location.LatLng diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt index a7afc6b148..da58f5dc9c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.bookmarks.locations -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.nearby.Place import kotlinx.coroutines.runBlocking import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt index 52121bf84a..a95459412b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationFragmentUnitTests.kt @@ -10,8 +10,8 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt index 5932f24bc1..4fe96e3da1 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt @@ -7,16 +7,16 @@ import android.database.MatrixCursor import android.database.sqlite.SQLiteDatabase import android.net.Uri import android.os.RemoteException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.isA +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.bookmarks.models.Bookmark import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.Companion.BASE_URI diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt index 154a5a9b3d..decd4905e9 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.bookmarks.pictures import android.net.Uri -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.bookmarks.models.Bookmark import fr.free.nrw.commons.media.MediaClient diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt index b1dae0fab7..166dcc446c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt @@ -14,9 +14,9 @@ import android.widget.TextView import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt index f876916b64..95f881283b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.campaigns -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.campaigns.models.Campaign import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt index 21fdba2f57..f5577938aa 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoriesModelTest.kt @@ -1,11 +1,11 @@ package fr.free.nrw.commons.category import categoryItem -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import depictedItem import fr.free.nrw.commons.upload.GpsCategoryModel import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt index 5edf55f6ed..ff1a0ef306 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.category -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult diff --git a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt index 3499ffaee6..228c928a61 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt @@ -6,16 +6,16 @@ import android.database.Cursor import android.database.MatrixCursor import android.database.sqlite.SQLiteDatabase import android.os.RemoteException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.isA +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.category.CategoryDao.Table.ALL_FIELDS import fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_DESCRIPTION diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt index 11b5fe9a23..e474bb1b94 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionBoundaryCallbackTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.contributions import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.auth.SessionManager import fr.free.nrw.commons.media.MediaClient import io.reactivex.Scheduler diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt index 5c35f71eda..458b90f853 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.contributions import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.nhaarman.mockitokotlin2.times +import org.mockito.kotlin.times import io.reactivex.Scheduler import io.reactivex.schedulers.Schedulers import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt index de226c97c8..f67bd08c1e 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.loader.content.CursorLoader import androidx.loader.content.Loader -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.repository.UploadRepository import io.reactivex.schedulers.TestScheduler import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt index b98603b494..7840b21036 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsRepositoryTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.contributions -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.utils.createMockDataSourceFactory import io.reactivex.Scheduler import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt index b1bd7ac35e..4768e91e37 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListenerTest.kt @@ -5,7 +5,7 @@ import android.view.GestureDetector import android.view.MotionEvent import android.view.View import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestUtility.setFinalStatic diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt index 08dadca25a..c41b5bcd51 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/FolderAdapterTest.kt @@ -6,8 +6,8 @@ import android.net.Uri import android.view.LayoutInflater import android.view.View import android.widget.GridLayout -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.whenever import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.customselector.listeners.FolderClickListener diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt index 6f2f709172..1ccbc3a572 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapterTest.kt @@ -7,7 +7,7 @@ import android.net.Uri import android.view.LayoutInflater import android.view.View import android.widget.GridLayout -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.customselector.listeners.ImageSelectListener diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt index 7b4891c98c..d58c075bec 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFileLoaderTest.kt @@ -3,10 +3,10 @@ package fr.free.nrw.commons.customselector.ui.selector import android.content.ContentResolver import android.content.Context import android.provider.MediaStore -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.same +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.same import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestUtility.setFinalStatic import fr.free.nrw.commons.customselector.listeners.ImageLoaderListener diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt index eeb6db46a5..3d7e9f0044 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageFragmentTest.kt @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt index 3111031dea..b117c7c811 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/ImageLoaderTest.kt @@ -4,8 +4,8 @@ import android.content.ContentResolver import android.content.Context import android.content.SharedPreferences import android.net.Uri -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestUtility.setFinalStatic import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt index 2300998108..62295342e3 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt @@ -2,10 +2,10 @@ package fr.free.nrw.commons.delete import android.app.AlertDialog import android.content.Context -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.actions.PageEditClient diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt index e3d69d41c6..e99e9f75ac 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/BasePagingPresenterTest.kt @@ -4,9 +4,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.lifecycle.LiveData import androidx.paging.PagedList import com.jraska.livedata.test -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.explore.paging.BasePagingPresenter import fr.free.nrw.commons.explore.paging.FooterItem import fr.free.nrw.commons.explore.paging.LoadingState diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt index 85298d0a3f..4e66118eba 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreFragmentUnitTest.kt @@ -11,7 +11,7 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider import com.google.android.material.tabs.TabLayout -import com.nhaarman.mockitokotlin2.eq +import org.mockito.kotlin.eq import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt index 62068f4f95..ebdbf61a32 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/ExploreListRootFragmentUnitTest.kt @@ -5,8 +5,8 @@ import android.view.LayoutInflater import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times +import org.mockito.kotlin.any +import org.mockito.kotlin.times import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt index c0f9bd7430..361a56edf8 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PageableBaseDataSourceTest.kt @@ -2,12 +2,12 @@ package fr.free.nrw.commons.explore import androidx.lifecycle.LiveData import androidx.paging.PagedList -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.explore.depictions.search.LoadFunction import fr.free.nrw.commons.explore.paging.LiveDataConverter import fr.free.nrw.commons.explore.paging.PageableBaseDataSource diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt index 9460999f49..ea996cfc1b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceFactoryTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.explore -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.mock +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify import fr.free.nrw.commons.explore.depictions.DepictsClient import fr.free.nrw.commons.explore.paging.LoadingState import fr.free.nrw.commons.explore.paging.PagingDataSource diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt index f8621ad880..6eac469f2d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/PagingDataSourceTest.kt @@ -1,11 +1,11 @@ package fr.free.nrw.commons.explore import androidx.paging.PositionalDataSource -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.explore.depictions.search.LoadingStates import fr.free.nrw.commons.explore.paging.LoadingState import fr.free.nrw.commons.explore.paging.PagingDataSource diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/PageableSearchCategoriesDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/PageableSearchCategoriesDataSourceTest.kt index 59c49dc894..0fea1eace8 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/PageableSearchCategoriesDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/PageableSearchCategoriesDataSourceTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.explore.categories -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.category.CategoryClient import fr.free.nrw.commons.explore.categories.search.PageableSearchCategoriesDataSource import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSourceTest.kt index fff0423e4a..024b8f6a5d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/media/PageableCategoriesMediaDataSourceTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.explore.categories.media -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.explore.paging.LiveDataConverter import fr.free.nrw.commons.media.MediaClient import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt index 5a08dea611..b9e35b2565 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/parent/PageableParentCategoriesDataSourceTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.explore.categories.parent -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.category.CategoryClient import fr.free.nrw.commons.explore.paging.LiveDataConverter import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt index a7c2af98be..5fa4ef03aa 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/categories/sub/PageableSubCategoriesDataSourceTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.explore.categories.sub -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.category.CategoryClient import fr.free.nrw.commons.explore.paging.LiveDataConverter import io.reactivex.Single diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt index 3c1d7ade4e..6f9b7c55f6 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.explore.depictions -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import depictSearchItem import entity import fr.free.nrw.commons.mwapi.Binding diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt index 027c90f9c0..c1c8095dcf 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/PageableDepictionsDataSourceTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.explore.depictions -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.explore.depictions.search.PageableDepictionsDataSource import io.reactivex.Single import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt index 7102b84523..1c6a6196a0 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/child/PageableChildDepictionsDataSourceTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.explore.depictions.child -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import depictedItem import fr.free.nrw.commons.explore.paging.LiveDataConverter import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt index e51ca29b95..8a4e4715bf 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/media/PageableDepictedMediaDataSourceTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.explore.depictions.media -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.media.WikidataMediaClient import io.reactivex.Single import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt index de573641c8..3ec1532be7 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/parent/PageableParentDepictionsDataSourceTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.explore.depictions.parent -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import depictedItem import fr.free.nrw.commons.explore.paging.LiveDataConverter import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt index 1d487bf542..b194ede261 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.explore.media -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.media.MediaClient import io.reactivex.Single import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt index 5e128d4ee2..4eaa481b5d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt @@ -6,16 +6,16 @@ import android.database.Cursor import android.database.MatrixCursor import android.database.sqlite.SQLiteDatabase import android.os.RemoteException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.isNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.isA +import org.mockito.kotlin.isNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.explore.models.RecentSearch import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.Companion.BASE_URI diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt index cd1186fc81..656b80a425 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragmentUnitTest.kt @@ -7,7 +7,7 @@ import android.widget.ArrayAdapter import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.contributions.MainActivity diff --git a/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt index 00b9c0fd91..f0b17896f3 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/explore/search/SearchActivityUnitTests.kt @@ -3,7 +3,7 @@ package fr.free.nrw.commons.explore.search import android.content.Context import androidx.fragment.app.FragmentManager import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.Media import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.ViewPagerAdapter diff --git a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt index 17fcc32cd3..e14775998d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/feedback/FeedbackDialogTests.kt @@ -4,7 +4,7 @@ import android.content.Context import android.os.Looper.getMainLooper import android.text.Editable import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.doReturn +import org.mockito.kotlin.doReturn import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.TestUtility.setFinalStatic diff --git a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt index b7ef7878fd..bfd280b4f7 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/filepicker/FilePickerTest.kt @@ -10,9 +10,9 @@ import android.provider.MediaStore import androidx.activity.result.ActivityResultLauncher import androidx.preference.PreferenceManager import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.verify import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity import org.junit.Assert.assertEquals diff --git a/app/src/test/kotlin/fr/free/nrw/commons/kvstore/BasicKvStoreTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/kvstore/BasicKvStoreTest.kt index 99fdf915b7..fb231dbfd2 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/kvstore/BasicKvStoreTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/kvstore/BasicKvStoreTest.kt @@ -2,9 +2,9 @@ package fr.free.nrw.commons.kvstore import android.content.Context import android.content.SharedPreferences -import com.nhaarman.mockitokotlin2.atLeast -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.atLeast +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.kvstore.BasicKvStore.Companion.KEY_VERSION import org.junit.Assert import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/kvstore/JsonKvStoreTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/kvstore/JsonKvStoreTest.kt index a49905c566..96ba67849b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/kvstore/JsonKvStoreTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/kvstore/JsonKvStoreTest.kt @@ -3,9 +3,9 @@ package fr.free.nrw.commons.kvstore import android.content.Context import android.content.SharedPreferences import com.google.gson.Gson -import com.nhaarman.mockitokotlin2.atLeast -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.atLeast +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.kvstore.BasicKvStore.Companion.KEY_VERSION import org.junit.Assert import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt index bbf416e2c5..30bfd4b09b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerActivityUnitTests.kt @@ -8,8 +8,8 @@ import android.widget.ImageView import android.widget.TextView import androidx.appcompat.widget.AppCompatTextView import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import fr.free.nrw.commons.CameraPosition import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.kvstore.JsonKvStore diff --git a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt index 8f52b1be3f..b33a8f3592 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/locationpicker/LocationPickerViewModelUnitTests.kt @@ -2,10 +2,10 @@ package fr.free.nrw.commons.locationpicker import android.app.Application import androidx.lifecycle.MutableLiveData -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.CameraPosition import org.junit.Before import org.junit.Test diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt index 225b4bd809..bed84d3132 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt @@ -7,9 +7,9 @@ import com.facebook.imagepipeline.producers.Consumer import com.facebook.imagepipeline.producers.NetworkFetcher import com.facebook.imagepipeline.producers.ProducerContext import com.facebook.imagepipeline.request.ImageRequest -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.CommonsApplication import fr.free.nrw.commons.kvstore.JsonKvStore import okhttp3.CacheControl diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt index cc6cdb6179..c768b95068 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.media -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.BuildConfig import fr.free.nrw.commons.Media import fr.free.nrw.commons.explore.media.MediaConverter diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt index 6159a3ccf0..02b0c5b26a 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt @@ -25,8 +25,8 @@ import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.generic.GenericDraweeHierarchy import com.facebook.drawee.view.SimpleDraweeView import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.whenever import fr.free.nrw.commons.locationpicker.LocationPickerActivity import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt index a6c925543f..a74672ac07 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailPagerFragmentUnitTests.kt @@ -12,11 +12,11 @@ import androidx.test.core.app.ApplicationProvider import androidx.work.testing.WorkManagerTestInitHelper import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt index 5389c8551d..fdec86991b 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/MultiPointerGestureDetectorUnitTest.kt @@ -1,9 +1,9 @@ package fr.free.nrw.commons.media.zoomControllers import android.view.MotionEvent -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.media.zoomControllers.gestures.MultiPointerGestureDetector import org.junit.Assert import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt index 3c6af2f56d..530c199fa5 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/zoomControllers/TransformGestureDetectorUnitTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.media.zoomControllers import android.view.MotionEvent -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.media.zoomControllers.gestures.MultiPointerGestureDetector import fr.free.nrw.commons.media.zoomControllers.gestures.TransformGestureDetector import org.junit.Assert diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt index b2177b1d2d..617ae3d815 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckBoxTriStatesTest.kt @@ -2,7 +2,7 @@ package fr.free.nrw.commons.nearby import android.widget.CompoundButton import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.location.LatLng import fr.free.nrw.commons.nearby.CheckBoxTriStates.CHECKED diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt index 60fabc8571..e90378e7c7 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyControllerTest.kt @@ -2,9 +2,9 @@ package fr.free.nrw.commons.nearby import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.eq +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.eq import fr.free.nrw.commons.BaseMarker import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.location.LatLng diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt index 96098e2a03..64f3bc9315 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt @@ -1,8 +1,8 @@ package fr.free.nrw.commons.nearby -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao import fr.free.nrw.commons.location.LatLng import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt index 7fb3ba8bde..3e93712924 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentUnitTest.kt @@ -17,8 +17,8 @@ import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.BaseMarker import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt index f83aab4534..463d51ce9a 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyPlacesTest.kt @@ -1,9 +1,9 @@ package fr.free.nrw.commons.nearby -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.times +import org.mockito.kotlin.verify import fr.free.nrw.commons.location.LatLng import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient import org.junit.Before diff --git a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt index 0b7498592c..f12ed91c91 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/quiz/QuizCheckerUnitTest.kt @@ -4,7 +4,7 @@ import android.app.Activity import androidx.test.core.app.ApplicationProvider import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.any +import org.mockito.kotlin.any import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.auth.SessionManager import fr.free.nrw.commons.kvstore.JsonKvStore diff --git a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt index e0f4587f46..317ead0822 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/recentlanguages/RecentLanguagesDaoUnitTest.kt @@ -6,11 +6,11 @@ import android.database.Cursor import android.database.MatrixCursor import android.database.sqlite.SQLiteDatabase import android.os.RemoteException -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.inOrder -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.inOrder +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.COLUMN_CODE import fr.free.nrw.commons.recentlanguages.RecentLanguagesDao.Table.COLUMN_NAME diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt index f2faf769ac..9071e4445c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewActivityTest.kt @@ -7,7 +7,7 @@ import android.view.MenuItem import androidx.test.core.app.ApplicationProvider import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.doNothing +import org.mockito.kotlin.doNothing import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt index 08237c5d92..d1adaafc67 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt @@ -6,8 +6,8 @@ import android.os.Looper import androidx.test.core.app.ApplicationProvider import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt index a0e53cfabb..7d857aff40 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.review -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.media.MediaClient import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt index bf4bd18784..4abe615607 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewImageFragmentTest.kt @@ -12,7 +12,7 @@ import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.soloader.SoLoader -import com.nhaarman.mockitokotlin2.doReturn +import org.mockito.kotlin.doReturn import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory import fr.free.nrw.commons.R diff --git a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt index acd56c5f4b..8c9f1dd294 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/settings/SettingsFragmentUnitTests.kt @@ -11,10 +11,10 @@ import android.widget.TextView import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.recentlanguages.Language import fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapter diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt index 536f61d20f..6d7add5cd2 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt @@ -2,11 +2,11 @@ package fr.free.nrw.commons.upload import androidx.lifecycle.MutableLiveData import categoryItem -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoMoreInteractions +import org.mockito.kotlin.whenever import fr.free.nrw.commons.R import fr.free.nrw.commons.category.CategoryItem import fr.free.nrw.commons.repository.UploadRepository diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt index 1abff908e2..bd08d50deb 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt @@ -1,9 +1,9 @@ package fr.free.nrw.commons.upload import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import depictedItem import fr.free.nrw.commons.Media import fr.free.nrw.commons.explore.depictions.DepictsClient diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt index b448df6d26..c86c7534e5 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.upload -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.utils.UnderlineUtils import fr.free.nrw.commons.kvstore.JsonKvStore import fr.free.nrw.commons.repository.UploadRepository diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt index 285c69233c..18b0226b3f 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadClientTest.kt @@ -2,13 +2,13 @@ package fr.free.nrw.commons.upload import com.google.gson.Gson import com.google.gson.JsonObject -import com.nhaarman.mockitokotlin2.KArgumentCaptor -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.KArgumentCaptor +import org.mockito.kotlin.any +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.CommonsApplication.Companion.DEFAULT_EDIT_SUMMARY import fr.free.nrw.commons.auth.csrf.CsrfTokenClient import fr.free.nrw.commons.contributions.ChunkInfo diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadControllerTest.kt index cd2c799940..f034c6c92d 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadControllerTest.kt @@ -2,8 +2,8 @@ package fr.free.nrw.commons.upload import android.content.ContentResolver import android.content.Context -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.contributions.Contribution import fr.free.nrw.commons.kvstore.JsonKvStore diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt index 7cc59b78dd..6acff8ad86 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaDetailAdapterUnitTest.kt @@ -10,10 +10,10 @@ import android.widget.ListView import android.widget.TextView import androidx.activity.result.ActivityResultLauncher import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.recentlanguages.Language import fr.free.nrw.commons.recentlanguages.RecentLanguagesAdapter diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt index da14438342..5d4865633c 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt @@ -1,10 +1,10 @@ package fr.free.nrw.commons.upload import android.net.Uri -import com.nhaarman.mockitokotlin2.argumentCaptor -import com.nhaarman.mockitokotlin2.isA -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.isA +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.R import fr.free.nrw.commons.filepicker.UploadableFile import fr.free.nrw.commons.location.LatLng diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt index 1e06888746..630d583f41 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadPresenterTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.upload -import com.nhaarman.mockitokotlin2.verify +import org.mockito.kotlin.verify import fr.free.nrw.commons.CommonsApplication import fr.free.nrw.commons.contributions.Contribution import fr.free.nrw.commons.filepicker.UploadableFile diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt index 9c022c9361..7d0e4f8083 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadRepositoryUnitTest.kt @@ -1,9 +1,9 @@ package fr.free.nrw.commons.upload -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.category.CategoriesModel import fr.free.nrw.commons.category.CategoryItem diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt index d90a288cab..4db0b82d19 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictEditHelperUnitTest.kt @@ -2,7 +2,7 @@ package fr.free.nrw.commons.upload.depicts import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.R import fr.free.nrw.commons.TestCommonsApplication diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt index e10ad2ba9d..d85c0027a9 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/depicts/DepictsFragmentUnitTests.kt @@ -8,7 +8,7 @@ import android.view.View import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import depictedItem import fr.free.nrw.commons.Media import fr.free.nrw.commons.OkHttpConnectionFactory diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt index 0cab47c67f..79ba4a75f3 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragmentUnitTest.kt @@ -19,7 +19,7 @@ import androidx.fragment.app.FragmentTransaction import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.github.chrisbanes.photoview.PhotoView -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import fr.free.nrw.commons.CameraPosition import fr.free.nrw.commons.locationpicker.LocationPicker import fr.free.nrw.commons.locationpicker.LocationPickerActivity diff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt index 45385f4412..c621524552 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/FileUtilsTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.utils -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.mock import fr.free.nrw.commons.upload.FileUtils import fr.free.nrw.commons.upload.FileUtilsWrapper import org.junit.Assert.assertEquals diff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/MediaAttributionUtilTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/MediaAttributionUtilTest.kt index cd1e41321b..a81aad8ac7 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/utils/MediaAttributionUtilTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/MediaAttributionUtilTest.kt @@ -2,7 +2,7 @@ package fr.free.nrw.commons.utils import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.Media import fr.free.nrw.commons.TestCommonsApplication import fr.free.nrw.commons.media.IdAndLabels diff --git a/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt b/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt index 633ee39641..5181853628 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/utils/PagedListMock.kt @@ -9,7 +9,7 @@ import androidx.room.InvalidationTracker import androidx.room.RoomDatabase import androidx.room.RoomSQLiteQuery import androidx.room.paging.LimitOffsetDataSource -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import org.mockito.Mockito.mock fun List.asPagedList(config: PagedList.Config? = null): LiveData> { diff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt index a2f3d10fbf..84290de7d2 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikiBaseClientUnitTest.kt @@ -1,6 +1,6 @@ package fr.free.nrw.commons.wikidata -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.auth.csrf.CsrfTokenClient import fr.free.nrw.commons.upload.UploadResult import fr.free.nrw.commons.upload.WikiBaseInterface diff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt index 3223011447..09ee1e42b2 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt @@ -1,7 +1,7 @@ package fr.free.nrw.commons.wikidata import com.google.gson.Gson -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.whenever import fr.free.nrw.commons.wikidata.model.PageInfo import fr.free.nrw.commons.wikidata.model.StatementPartial import fr.free.nrw.commons.wikidata.model.WbCreateClaimResponse diff --git a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt index c22195c7c6..29f5625d29 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt @@ -2,9 +2,9 @@ package fr.free.nrw.commons.wikidata import android.content.Context import com.google.gson.Gson -import com.nhaarman.mockitokotlin2.anyOrNull -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.whenever +import org.mockito.kotlin.anyOrNull +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever import fr.free.nrw.commons.kvstore.JsonKvStore import fr.free.nrw.commons.upload.UploadResult import fr.free.nrw.commons.upload.WikidataPlace diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 95be2d966e..d1eb5cedcd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.0" +agp = "8.3.2" acra = "5.8.4" activityCompose = "1.9.3" adapterdelegates = "4.3.0" @@ -45,7 +45,7 @@ loggingInterceptor = "4.10.0" logbackAndroidClassic = "1.1.1-6" material = "1.12.0" mockitoCore = "5.6.0" -mockitoKotlin = "2.2.0" +mockitoKotlin = "5.4.0" mockk = "1.13.5" mockwebserver = "4.10.0" multidex = "2.0.1" @@ -158,7 +158,7 @@ soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" mockk = { module = "io.mockk:mockk", version.ref = "mockk" } mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" } -mockito-kotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version.ref = "mockitoKotlin" } +mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" } powermock-api-mockito = { module = "org.powermock:powermock-api-mockito2", version.ref = "powermock" } powermock-module-junit = { module = "org.powermock:powermock-module-junit4", version.ref = "powermock" } From d06f183c4e5feb30dbf1b87c287e9f8f4441b999 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 13:09:31 +0000 Subject: [PATCH 6/6] Fix Compose BOM version: revert to 2024.11.00 (2024.12.00 doesn't exist) Co-authored-by: nicolas-raoul <99590+nicolas-raoul@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1eb5cedcd..e38043f951 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ annotation = "1.3.0" browser = "1.3.0" cardview = "1.0.0" commonsIo = "2.6" -composeBom = "2024.12.00" +composeBom = "2024.11.00" constraintlayout = "1.1.3" coordinates2country = "1.8" dexcount = "4.0.0"