mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment (#3499)

Browse source 
* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - add apropriate schedulers and convert justs to fromCallable

* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - remove test for removed functionality

* #3493 App freezes for 15 seconds when you press Next in UploadMediaDetailsFragment - replace kotlin with java
This commit is contained in:
Seán Mac Gillicuddy 2020-03-13 13:47:20 +00:00 • committed by GitHub
parent ed5f8efa6b
commit 4bd7a5b1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 119 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/test/kotlin/fr/free/nrw/commons/upload/ImageProcessingServiceTest.kt
View file

@ -88,7 +88,7 @@ class u {
@Test
fun validateImageForKeepImage() {
`when`(uploadItem.imageQuality).thenReturn(ImageUtils.IMAGE_KEEP)
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.IMAGE_OK, validateImage.blockingGet())
}
@ -96,13 +96,13 @@ class u {
fun validateImageForDuplicateImage() {
`when`(mediaClient!!.checkFileExistsUsingSha(ArgumentMatchers.anyString()))
.thenReturn(Single.just(true))
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.IMAGE_DUPLICATE, validateImage.blockingGet())
}
@Test
fun validateImageForOkImage() {
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.IMAGE_OK, validateImage.blockingGet())
}
@ -110,7 +110,7 @@ class u {
fun validateImageForDarkImage() {
`when`(imageUtilsWrapper?.checkIfImageIsTooDark(ArgumentMatchers.anyString()))
.thenReturn(Single.just(ImageUtils.IMAGE_DARK))
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.IMAGE_DARK, validateImage.blockingGet())
}
@ -118,23 +118,15 @@ class u {
fun validateImageForWrongGeoLocation() {
`when`(imageUtilsWrapper!!.checkImageGeolocationIsDifferent(ArgumentMatchers.anyString(), any(LatLng::class.java)))
.thenReturn(Single.just(ImageUtils.IMAGE_GEOLOCATION_DIFFERENT))
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.IMAGE_GEOLOCATION_DIFFERENT, validateImage.blockingGet())
}
@Test
fun validateImageForFileNameExistsWithCheckTitleOff() {
`when`(mediaClient?.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))
.thenReturn(Single.just(true))
val validateImage = imageProcessingService!!.validateImage(uploadItem, false)
assertEquals(ImageUtils.IMAGE_OK, validateImage.blockingGet())
}
@Test
fun validateImageForFileNameExistsWithCheckTitleOn() {
`when`(mediaClient?.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))
.thenReturn(Single.just(true))
val validateImage = imageProcessingService!!.validateImage(uploadItem, true)
val validateImage = imageProcessingService!!.validateImage(uploadItem)
assertEquals(ImageUtils.FILE_NAME_EXISTS, validateImage.blockingGet())
}
}
}

6
app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
View file

@ -82,9 +82,9 @@ class UploadMediaPresenterTest {
*/
@Test
fun verifyImageQualityTest() {
Mockito.`when`(repository?.getImageQuality(ArgumentMatchers.any(UploadModel.UploadItem::class.java), ArgumentMatchers.any(Boolean::class.java))).thenReturn(testSingleImageResult)
Mockito.`when`(repository?.getImageQuality(ArgumentMatchers.any(UploadModel.UploadItem::class.java))).thenReturn(testSingleImageResult)
Mockito.`when`(uploadItem?.imageQuality).thenReturn(ArgumentMatchers.anyInt())
uploadMediaPresenter?.verifyImageQuality(uploadItem, true)
uploadMediaPresenter?.verifyImageQuality(uploadItem)
verify(view)?.showProgress(true)
testScheduler?.triggerActions()
verify(view)?.showProgress(false)
@ -185,4 +185,4 @@ class UploadMediaPresenterTest {
verify(repository)?.updateUploadItem(0,uploadItem)
}
}
}

4
app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt
View file

@ -65,7 +65,7 @@ class UploadModelTest {
.thenReturn(mock(FileInputStream::class.java))
`when`(fileUtilsWrapper!!.getGeolocationOfFile(anyString()))
.thenReturn("")
`when`(imageProcessingService!!.validateImage(any(UploadModel.UploadItem::class.java), anyBoolean()))
`when`(imageProcessingService!!.validateImage(any(UploadModel.UploadItem::class.java)))
.thenReturn(Single.just(IMAGE_OK))
}
@ -129,4 +129,4 @@ class UploadModelTest {
@Test
fun buildContributions() {
}
}
}