mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
Migrated recentlanguages and repository module from Java to Kotlin (#5948)
* Rename .java to .kt * Migrated recentlanguages module to Kotlin * Rename .java to .kt * Migrated repository module to Kotlin
This commit is contained in:
parent
088dd2479e
commit
fe347c21fd
13 changed files with 825 additions and 798 deletions
|
|
@ -56,9 +56,9 @@ class CategoriesPresenterTest {
|
|||
@Throws(Exception::class)
|
||||
fun `Test onAttachViewWithMedia when media is not null`() {
|
||||
categoriesPresenter.onAttachViewWithMedia(view, media())
|
||||
whenever(repository.getCategories(repository.selectedExistingCategories))
|
||||
whenever(repository.getCategories(repository.getSelectedExistingCategories()))
|
||||
.thenReturn(Observable.just(mutableListOf(categoryItem())))
|
||||
whenever(repository.searchAll("mock", emptyList(), repository.selectedDepictions))
|
||||
whenever(repository.searchAll("mock", emptyList(), repository.getSelectedDepictions()))
|
||||
.thenReturn(Observable.just(mutableListOf(categoryItem())))
|
||||
val method: Method =
|
||||
CategoriesPresenter::class.java.getDeclaredMethod(
|
||||
|
|
@ -88,7 +88,7 @@ class CategoriesPresenterTest {
|
|||
val emptyCaptionUploadItem = mock<UploadItem>()
|
||||
whenever(emptyCaptionUploadItem.uploadMediaDetails)
|
||||
.thenReturn(listOf(UploadMediaDetail(captionText = "")))
|
||||
whenever(repository.uploads).thenReturn(
|
||||
whenever(repository.getUploads()).thenReturn(
|
||||
listOf(
|
||||
nonEmptyCaptionUploadItem,
|
||||
emptyCaptionUploadItem,
|
||||
|
|
@ -105,7 +105,7 @@ class CategoriesPresenterTest {
|
|||
)
|
||||
whenever(repository.isSpammyCategory("selected")).thenReturn(false)
|
||||
whenever(repository.isSpammyCategory("doesContainYear")).thenReturn(true)
|
||||
whenever(repository.selectedCategories).thenReturn(
|
||||
whenever(repository.getSelectedCategories()).thenReturn(
|
||||
listOf(
|
||||
categoryItem("selected", "", "", true),
|
||||
),
|
||||
|
|
@ -130,7 +130,7 @@ class CategoriesPresenterTest {
|
|||
|
||||
whenever(repository.searchAll(any(), any(), any()))
|
||||
.thenReturn(Observable.just(emptyCategories))
|
||||
whenever(repository.selectedCategories).thenReturn(listOf())
|
||||
whenever(repository.getSelectedCategories()).thenReturn(listOf())
|
||||
categoriesPresenter.searchForCategories(query)
|
||||
testScheduler.triggerActions()
|
||||
val method: Method =
|
||||
|
|
@ -154,7 +154,7 @@ class CategoriesPresenterTest {
|
|||
fun `verifyCategories with non empty selection goes to next screen`() {
|
||||
categoriesPresenter.onAttachView(view)
|
||||
val item = categoryItem()
|
||||
whenever(repository.selectedCategories).thenReturn(listOf(item))
|
||||
whenever(repository.getSelectedCategories()).thenReturn(listOf(item))
|
||||
categoriesPresenter.verifyCategories()
|
||||
verify(repository).setSelectedCategories(listOf(item.name))
|
||||
verify(view).goToNextScreen()
|
||||
|
|
@ -163,7 +163,7 @@ class CategoriesPresenterTest {
|
|||
@Test
|
||||
fun `verifyCategories with empty selection show no category selected`() {
|
||||
categoriesPresenter.onAttachView(view)
|
||||
whenever(repository.selectedCategories).thenReturn(listOf())
|
||||
whenever(repository.getSelectedCategories()).thenReturn(listOf())
|
||||
categoriesPresenter.verifyCategories()
|
||||
verify(view).showNoCategorySelected()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class DepictsPresenterTest {
|
|||
)
|
||||
whenever(repository.searchAllEntities("")).thenReturn(Flowable.just(searchResults))
|
||||
val selectedItem = depictedItem(id = "selected")
|
||||
whenever(repository.selectedDepictions).thenReturn(listOf(selectedItem))
|
||||
whenever(repository.getSelectedDepictions()).thenReturn(listOf(selectedItem))
|
||||
depictsPresenter.searchForDepictions("")
|
||||
testScheduler.triggerActions()
|
||||
verify(view).showProgress(false)
|
||||
|
|
@ -123,14 +123,14 @@ class DepictsPresenterTest {
|
|||
|
||||
@Test
|
||||
fun `verifyDepictions with non empty selectedDepictions goes to next screen`() {
|
||||
whenever(repository.selectedDepictions).thenReturn(listOf(depictedItem()))
|
||||
whenever(repository.getSelectedDepictions()).thenReturn(listOf(depictedItem()))
|
||||
depictsPresenter.verifyDepictions()
|
||||
verify(view).goToNextScreen()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `verifyDepictions with empty selectedDepictions goes to noDepictionSelected`() {
|
||||
whenever(repository.selectedDepictions).thenReturn(emptyList())
|
||||
whenever(repository.getSelectedDepictions()).thenReturn(emptyList())
|
||||
depictsPresenter.verifyDepictions()
|
||||
verify(view).noDepictionSelected()
|
||||
}
|
||||
|
|
@ -162,7 +162,7 @@ class DepictsPresenterTest {
|
|||
@Test
|
||||
fun `Test searchResults when media is not null`() {
|
||||
Whitebox.setInternalState(depictsPresenter, "media", media)
|
||||
whenever(repository.getDepictions(repository.selectedExistingDepictions))
|
||||
whenever(repository.getDepictions(repository.getSelectedExistingDepictions()))
|
||||
.thenReturn(Flowable.just(listOf(depictedItem())))
|
||||
whenever(repository.searchAllEntities("querystring"))
|
||||
.thenReturn(Flowable.just(listOf(depictedItem())))
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ class UploadPresenterTest {
|
|||
fun handleSubmitImagesNoLocationWithConsecutiveNoLocationUploads() {
|
||||
`when`(imageCoords.imageCoordsExists).thenReturn(false)
|
||||
`when`(uploadItem.getGpsCoords()).thenReturn(imageCoords)
|
||||
`when`(repository.uploads).thenReturn(uploadableItems)
|
||||
`when`(repository.getUploads()).thenReturn(uploadableItems)
|
||||
uploadableItems.add(uploadItem)
|
||||
|
||||
// test 1 - insufficient count
|
||||
|
|
@ -112,7 +112,7 @@ class UploadPresenterTest {
|
|||
).thenReturn(UploadPresenter.CONSECUTIVE_UPLOADS_WITHOUT_COORDINATES_REMINDER_THRESHOLD)
|
||||
`when`(imageCoords.imageCoordsExists).thenReturn(true)
|
||||
`when`(uploadItem.getGpsCoords()).thenReturn(imageCoords)
|
||||
`when`(repository.uploads).thenReturn(uploadableItems)
|
||||
`when`(repository.getUploads()).thenReturn(uploadableItems)
|
||||
uploadableItems.add(uploadItem)
|
||||
uploadPresenter.handleSubmit()
|
||||
// no alert dialog expected
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ class UploadRepositoryUnitTest {
|
|||
|
||||
@Test
|
||||
fun testGetUploads() {
|
||||
assertEquals(repository.uploads, uploadModel.uploads)
|
||||
assertEquals(repository.getUploads(), uploadModel.uploads)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -130,7 +130,7 @@ class UploadRepositoryUnitTest {
|
|||
|
||||
@Test
|
||||
fun testGetSelectedCategories() {
|
||||
assertEquals(repository.selectedCategories, categoriesModel.getSelectedCategories())
|
||||
assertEquals(repository.getSelectedCategories(), categoriesModel.getSelectedCategories())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -163,17 +163,17 @@ class UploadRepositoryUnitTest {
|
|||
|
||||
@Test
|
||||
fun testGetLicenses() {
|
||||
assertEquals(repository.licenses, uploadModel.licenses)
|
||||
assertEquals(repository.getLicenses(), uploadModel.licenses)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSelectedLicense() {
|
||||
assertEquals(repository.selectedLicense, uploadModel.selectedLicense)
|
||||
assertEquals(repository.getSelectedLicense(), uploadModel.selectedLicense)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetCount() {
|
||||
assertEquals(repository.count, uploadModel.count)
|
||||
assertEquals(repository.getCount(), uploadModel.count)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -242,12 +242,12 @@ class UploadRepositoryUnitTest {
|
|||
|
||||
@Test
|
||||
fun testGetSelectedDepictions() {
|
||||
assertEquals(repository.selectedDepictions, uploadModel.selectedDepictions)
|
||||
assertEquals(repository.getSelectedDepictions(), uploadModel.selectedDepictions)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSelectedExistingDepictions() {
|
||||
assertEquals(repository.selectedExistingDepictions, uploadModel.selectedExistingDepictions)
|
||||
assertEquals(repository.getSelectedExistingDepictions(), uploadModel.selectedExistingDepictions)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -264,7 +264,7 @@ class UploadRepositoryUnitTest {
|
|||
`when`(uploadItem.place).thenReturn(place)
|
||||
`when`(place.wikiDataEntityId).thenReturn("1")
|
||||
assertEquals(
|
||||
repository.placeDepictions,
|
||||
repository.getPlaceDepictions(),
|
||||
depictModel.getPlaceDepictions(listOf("1")),
|
||||
)
|
||||
}
|
||||
|
|
@ -326,7 +326,7 @@ class UploadRepositoryUnitTest {
|
|||
`when`(uploadModel.items).thenReturn(listOf(uploadItem))
|
||||
`when`(uploadItem.isWLMUpload).thenReturn(true)
|
||||
assertEquals(
|
||||
repository.isWMLSupportedForThisPlace,
|
||||
repository.isWMLSupportedForThisPlace(),
|
||||
true,
|
||||
)
|
||||
}
|
||||
|
|
@ -369,7 +369,7 @@ class UploadRepositoryUnitTest {
|
|||
@Test
|
||||
fun testGetSelectedExistingCategories() {
|
||||
assertEquals(
|
||||
repository.selectedExistingCategories,
|
||||
repository.getSelectedExistingCategories(),
|
||||
categoriesModel.getSelectedExistingCategories(),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue