Skip to content

Commit 5ec94db

Browse files
committed
Fix test
1 parent dbd1a63 commit 5ec94db

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
implementation 'com.facebook.fresco:fresco:1.13.0'
3333
implementation 'com.drewnoakes:metadata-extractor:2.11.0'
3434
implementation 'org.apache.commons:commons-lang3:3.8.1'
35-
implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.20'
35+
implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.22'
3636

3737
// UI
3838
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'

app/src/main/java/fr/free/nrw/commons/media/MediaClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Single<Boolean> checkPageExistsUsingTitle(String title) {
4040
public Single<Boolean> checkFileExistsUsingSha(String fileSha) {
4141
return mediaInterface.checkFileExistsUsingSha(fileSha)
4242
.map(mwQueryResponse -> mwQueryResponse
43-
.query().firstPage().allImages().size() > 0)
43+
.query().allImages().size() > 0)
4444
.singleOrError();
4545
}
4646
}

app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import org.mockito.Mock
1111
import org.mockito.Mockito.`when`
1212
import org.mockito.Mockito.mock
1313
import org.mockito.MockitoAnnotations
14+
import org.wikipedia.dataclient.mwapi.ImageDetails
1415
import org.wikipedia.dataclient.mwapi.MwQueryPage
1516
import org.wikipedia.dataclient.mwapi.MwQueryResponse
1617
import org.wikipedia.dataclient.mwapi.MwQueryResult
17-
import org.wikipedia.gallery.ImageInfo
1818

1919
class MediaClientTest {
2020

@@ -64,8 +64,8 @@ class MediaClientTest {
6464
@Test
6565
fun checkFileExistsUsingSha() {
6666
val mwQueryPage = mock(MwQueryPage::class.java)
67-
`when`(mwQueryPage.allImages()).thenReturn(listOf(mock(ImageInfo::class.java)))
6867
val mwQueryResult = mock(MwQueryResult::class.java)
68+
`when`(mwQueryResult.allImages()).thenReturn(listOf(mock(ImageDetails::class.java)))
6969
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
7070
`when`(mwQueryResult.pages()).thenReturn(listOf(mwQueryPage))
7171
val mockResponse = mock(MwQueryResponse::class.java)
@@ -81,8 +81,8 @@ class MediaClientTest {
8181
@Test
8282
fun checkFileNotExistsUsingSha() {
8383
val mwQueryPage = mock(MwQueryPage::class.java)
84-
`when`(mwQueryPage.allImages()).thenReturn(listOf())
8584
val mwQueryResult = mock(MwQueryResult::class.java)
85+
`when`(mwQueryResult.allImages()).thenReturn(listOf())
8686
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
8787
`when`(mwQueryResult.pages()).thenReturn(listOf(mwQueryPage))
8888
val mockResponse = mock(MwQueryResponse::class.java)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class u {
5858
`when`(uploadItem.title).thenReturn(mockTitle)
5959

6060
`when`(uploadItem.place).thenReturn(mockPlace)
61+
`when`(uploadItem.fileName).thenReturn("File:jpg")
6162

6263
`when`(fileUtilsWrapper!!.getFileInputStream(ArgumentMatchers.anyString()))
6364
.thenReturn(mock(FileInputStream::class.java))

0 commit comments

Comments
 (0)