mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer * #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption * #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes * #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments * #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients * #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource * #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test * #3749 Improve MediaClient UnitTests - test rewrite * #3749 Improve MediaClient UnitTests - align with buildConfig property
This commit is contained in:
Seán Mac Gillicuddy
GitHub
parent
82d8d40b4f
commit
e40e9690dd
2 changed files with 193 additions and 229 deletions
|
|
@ -107,21 +107,6 @@ class MediaClient @Inject constructor(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun mediaFromPageAndEntity(pages: List<MwQueryPage>): Single<List<Media>> {
|
|
||||||
return if (pages.isEmpty())
|
|
||||||
Single.just(emptyList())
|
|
||||||
else
|
|
||||||
getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
|
|
||||||
.map {
|
|
||||||
pages.zip(it.entities().values)
|
|
||||||
.mapNotNull { (page, entity) ->
|
|
||||||
page.imageInfo()?.let {
|
|
||||||
mediaConverter.convert(page, entity, it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches Media object from the imageInfo API
|
* Fetches Media object from the imageInfo API
|
||||||
*
|
*
|
||||||
|
|
@ -141,7 +126,6 @@ class MediaClient @Inject constructor(
|
||||||
fun getPictureOfTheDay(): Single<Media> {
|
fun getPictureOfTheDay(): Single<Media> {
|
||||||
val date = CommonsDateUtil.getIso8601DateFormatShort().format(Date())
|
val date = CommonsDateUtil.getIso8601DateFormatShort().format(Date())
|
||||||
return responseMapper(mediaInterface.getMediaWithGenerator("Template:Potd/$date")).map { it.first() }
|
return responseMapper(mediaInterface.getMediaWithGenerator("Template:Potd/$date")).map { it.first() }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getPageHtml(title: String?): Single<String> {
|
fun getPageHtml(title: String?): Single<String> {
|
||||||
|
|
@ -156,7 +140,6 @@ class MediaClient @Inject constructor(
|
||||||
mediaDetailInterface.getEntity(entityIds.joinToString("|"))
|
mediaDetailInterface.getEntity(entityIds.joinToString("|"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fun doesPageContainMedia(title: String?): Single<Boolean> {
|
fun doesPageContainMedia(title: String?): Single<Boolean> {
|
||||||
return pageMediaInterface.getMediaList(title)
|
return pageMediaInterface.getMediaList(title)
|
||||||
.map { it.items.isNotEmpty() }
|
.map { it.items.isNotEmpty() }
|
||||||
|
|
@ -175,4 +158,19 @@ class MediaClient @Inject constructor(
|
||||||
it.query()?.pages() ?: emptyList()
|
it.query()?.pages() ?: emptyList()
|
||||||
}.flatMap(::mediaFromPageAndEntity)
|
}.flatMap(::mediaFromPageAndEntity)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun mediaFromPageAndEntity(pages: List<MwQueryPage>): Single<List<Media>> {
|
||||||
|
return if (pages.isEmpty())
|
||||||
|
Single.just(emptyList())
|
||||||
|
else
|
||||||
|
getEntities(pages.map { "$PAGE_ID_PREFIX${it.pageId()}" })
|
||||||
|
.map {
|
||||||
|
pages.zip(it.entities().values)
|
||||||
|
.mapNotNull { (page, entity) ->
|
||||||
|
page.imageInfo()?.let {
|
||||||
|
mediaConverter.convert(page, entity, it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,268 +2,234 @@ package fr.free.nrw.commons.media
|
||||||
|
|
||||||
import com.nhaarman.mockitokotlin2.mock
|
import com.nhaarman.mockitokotlin2.mock
|
||||||
import com.nhaarman.mockitokotlin2.whenever
|
import com.nhaarman.mockitokotlin2.whenever
|
||||||
|
import fr.free.nrw.commons.BuildConfig
|
||||||
import fr.free.nrw.commons.Media
|
import fr.free.nrw.commons.Media
|
||||||
import fr.free.nrw.commons.explore.media.MediaConverter
|
import fr.free.nrw.commons.explore.media.MediaConverter
|
||||||
import fr.free.nrw.commons.media.model.PageMediaListItem
|
|
||||||
import fr.free.nrw.commons.media.model.PageMediaListResponse
|
import fr.free.nrw.commons.media.model.PageMediaListResponse
|
||||||
import fr.free.nrw.commons.utils.CommonsDateUtil
|
|
||||||
import io.reactivex.Single
|
import io.reactivex.Single
|
||||||
import junit.framework.Assert.*
|
import media
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import org.mockito.*
|
import org.mockito.ArgumentMatchers
|
||||||
import org.mockito.Mockito.*
|
import org.mockito.Mock
|
||||||
import org.wikipedia.dataclient.mwapi.ImageDetails
|
import org.mockito.MockitoAnnotations
|
||||||
import org.wikipedia.dataclient.mwapi.MwQueryPage
|
import org.wikipedia.dataclient.mwapi.MwQueryPage
|
||||||
import org.wikipedia.dataclient.mwapi.MwQueryResponse
|
import org.wikipedia.dataclient.mwapi.MwQueryResponse
|
||||||
import org.wikipedia.dataclient.mwapi.MwQueryResult
|
import org.wikipedia.dataclient.mwapi.MwQueryResult
|
||||||
import org.wikipedia.gallery.ImageInfo
|
import org.wikipedia.gallery.ImageInfo
|
||||||
import org.wikipedia.wikidata.Entities
|
import org.wikipedia.wikidata.Entities
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
|
|
||||||
class MediaClientTest {
|
class MediaClientTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
internal var mediaInterface: MediaInterface? = null
|
internal lateinit var mediaInterface: MediaInterface
|
||||||
@Mock
|
|
||||||
internal var mediaConverter: MediaConverter? = null
|
|
||||||
@Mock
|
|
||||||
internal var mediaDetailInterface: MediaDetailInterface? = null
|
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
internal var pageMediaInterface: PageMediaInterface? = null
|
internal lateinit var mediaConverter: MediaConverter
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
internal lateinit var mediaDetailInterface: MediaDetailInterface
|
||||||
|
|
||||||
@InjectMocks
|
@Mock
|
||||||
var mediaClient: MediaClient? = null
|
internal lateinit var pageMediaInterface: PageMediaInterface
|
||||||
|
|
||||||
|
val continuationMap = mapOf("continuation" to "continuation")
|
||||||
|
|
||||||
|
private lateinit var mediaClient: MediaClient
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
@Throws(Exception::class)
|
@Throws(Exception::class)
|
||||||
fun setUp() {
|
fun setUp() {
|
||||||
MockitoAnnotations.initMocks(this)
|
MockitoAnnotations.initMocks(this)
|
||||||
|
mediaClient =
|
||||||
|
MediaClient(mediaInterface, pageMediaInterface, mediaDetailInterface, mediaConverter)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun checkPageExistsUsingTitle() {
|
fun `getMediaById maps response of interface`() {
|
||||||
val mwQueryPage = mock(MwQueryPage::class.java)
|
val (mwQueryResponse, media) = expectSuccessfulMapping()
|
||||||
`when`(mwQueryPage.pageId()).thenReturn(10)
|
whenever(mediaInterface.getMediaById("id")).thenReturn(Single.just(mwQueryResponse))
|
||||||
val mwQueryResult = mock(MwQueryResult::class.java)
|
mediaClient.getMediaById("id").test().assertValue(media)
|
||||||
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
|
|
||||||
`when`(mwQueryResult.pages()).thenReturn(listOf(mwQueryPage))
|
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
|
||||||
`when`(mockResponse.query()).thenReturn(mwQueryResult)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
val checkPageExistsUsingTitle =
|
|
||||||
mediaClient!!.checkPageExistsUsingTitle("File:Test.jpg").blockingGet()
|
|
||||||
assertTrue(checkPageExistsUsingTitle)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun checkPageNotExistsUsingTitle() {
|
fun `checkPageExistsUsingTitle returns true for greater than 0 id`() {
|
||||||
val mwQueryPage = mock(MwQueryPage::class.java)
|
val mwQueryResponse = expectResponseWithPageId(1)
|
||||||
`when`(mwQueryPage.pageId()).thenReturn(0)
|
whenever(mediaInterface.checkPageExistsUsingTitle(""))
|
||||||
val mwQueryResult = mock(MwQueryResult::class.java)
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
|
mediaClient.checkPageExistsUsingTitle("").test().assertValue(true)
|
||||||
`when`(mwQueryResult.pages()).thenReturn(listOf())
|
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
|
||||||
`when`(mockResponse.query()).thenReturn(mwQueryResult)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.checkPageExistsUsingTitle(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
val checkPageExistsUsingTitle =
|
|
||||||
mediaClient!!.checkPageExistsUsingTitle("File:Test.jpg").blockingGet()
|
|
||||||
assertFalse(checkPageExistsUsingTitle)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun checkFileExistsUsingSha() {
|
fun `checkPageExistsUsingTitle returns false for 0 id`() {
|
||||||
val mwQueryPage = mock(MwQueryPage::class.java)
|
val mwQueryResponse = expectResponseWithPageId(0)
|
||||||
val mwQueryResult = mock(MwQueryResult::class.java)
|
whenever(mediaInterface.checkPageExistsUsingTitle(""))
|
||||||
`when`(mwQueryResult.allImages()).thenReturn(listOf(mock(ImageDetails::class.java)))
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
|
mediaClient.checkPageExistsUsingTitle("").test().assertValue(false)
|
||||||
`when`(mwQueryResult.pages()).thenReturn(listOf(mwQueryPage))
|
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
|
||||||
`when`(mockResponse.query()).thenReturn(mwQueryResult)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.checkFileExistsUsingSha(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
val checkFileExistsUsingSha = mediaClient!!.checkFileExistsUsingSha("abcde").blockingGet()
|
|
||||||
assertTrue(checkFileExistsUsingSha)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun checkFileNotExistsUsingSha() {
|
fun `checkFileExistsUsingSha returns false with no Images`() {
|
||||||
val mwQueryPage = mock(MwQueryPage::class.java)
|
val mwQueryResponse = mockQuery {
|
||||||
val mwQueryResult = mock(MwQueryResult::class.java)
|
whenever(allImages()).thenReturn(listOf())
|
||||||
`when`(mwQueryResult.allImages()).thenReturn(listOf())
|
}
|
||||||
`when`(mwQueryResult.firstPage()).thenReturn(mwQueryPage)
|
whenever(mediaInterface.checkFileExistsUsingSha(""))
|
||||||
`when`(mwQueryResult.pages()).thenReturn(listOf(mwQueryPage))
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
mediaClient.checkFileExistsUsingSha("").test().assertValue(false)
|
||||||
`when`(mockResponse.query()).thenReturn(mwQueryResult)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.checkFileExistsUsingSha(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
val checkFileExistsUsingSha = mediaClient!!.checkFileExistsUsingSha("abcde").blockingGet()
|
|
||||||
assertFalse(checkFileExistsUsingSha)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun getMedia() {
|
fun `checkFileExistsUsingSha returns true with Images`() {
|
||||||
val (mockResponse, media: Media) = expectGetEntitiesAndMediaConversion()
|
val mwQueryResponse = mockQuery {
|
||||||
|
whenever(allImages()).thenReturn(listOf(mock()))
|
||||||
`when`(mediaInterface!!.getMedia(ArgumentMatchers.anyString()))
|
}
|
||||||
.thenReturn(Single.just(mockResponse))
|
whenever(mediaInterface.checkFileExistsUsingSha(""))
|
||||||
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
mediaClient!!.getMedia("abcde").test().assertValue(media)
|
mediaClient.checkFileExistsUsingSha("").test().assertValue(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun getMediaNull() {
|
fun `getMediaListFromCategory is continuable and returns mapped response`() {
|
||||||
val imageInfo = ImageInfo()
|
val (mwQueryResponse, media) = expectSuccessfulMapping(continuationMap)
|
||||||
|
whenever(mediaInterface.getMediaListFromCategory("", 10, emptyMap()))
|
||||||
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
|
mediaClient.getMediaListFromCategory("").test().assertValues(listOf(media))
|
||||||
|
|
||||||
val mwQueryPage = mock(MwQueryPage::class.java)
|
whenever(mediaInterface.getMediaListFromCategory("", 10, continuationMap))
|
||||||
`when`(mwQueryPage.title()).thenReturn("Test")
|
.thenReturn(Single.error(Exception()))
|
||||||
`when`(mwQueryPage.imageInfo()).thenReturn(imageInfo)
|
mediaClient.getMediaListFromCategory("").test().assertError { true }
|
||||||
|
|
||||||
val mwQueryResult = mock(MwQueryResult::class.java)
|
mediaClient.resetCategoryContinuation("")
|
||||||
`when`(mwQueryResult.firstPage()).thenReturn(null)
|
val (resetMwQueryResponse, resetMedia)=expectSuccessfulMapping()
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
whenever(mediaInterface.getMediaListFromCategory("", 10, emptyMap()))
|
||||||
`when`(mockResponse.query()).thenReturn(mwQueryResult)
|
.thenReturn(Single.just(resetMwQueryResponse))
|
||||||
|
mediaClient.getMediaListFromCategory("").test().assertValues(listOf(resetMedia))
|
||||||
`when`(mediaInterface!!.getMedia(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
mediaClient!!.getMedia("abcde").test().assertErrorMessage("List is empty.")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun getPictureOfTheDay() {
|
fun `getMediaListForUser is continuable and returns mapped response`() {
|
||||||
val template = "Template:Potd/" + CommonsDateUtil.getIso8601DateFormatShort().format(Date())
|
val (mwQueryResponse, media) = expectSuccessfulMapping(null)
|
||||||
|
whenever(mediaInterface.getMediaListForUser("", 10, emptyMap()))
|
||||||
val (mockResponse, media: Media) = expectGetEntitiesAndMediaConversion()
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
`when`(mediaInterface!!.getMediaWithGenerator(template))
|
mediaClient.getMediaListForUser("").test().assertValues(listOf(media))
|
||||||
.thenReturn(Single.just(mockResponse))
|
mediaClient.getMediaListForUser("").test().assertValue(emptyList())
|
||||||
mediaClient!!.getPictureOfTheDay().test().assertValue(media)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun expectGetEntitiesAndMediaConversion(): Pair<MwQueryResponse, Media> {
|
@Test
|
||||||
val mockResponse = mock(MwQueryResponse::class.java)
|
fun `getMediaListFromSearch returns mapped response`() {
|
||||||
val queryResult: MwQueryResult = mock()
|
val (mwQueryResponse, media) = expectSuccessfulMapping()
|
||||||
whenever(mockResponse.query()).thenReturn(queryResult)
|
whenever(mediaInterface.getMediaListFromSearch("", 0, 1))
|
||||||
val queryPage: MwQueryPage = mock()
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
whenever(queryResult.pages()).thenReturn(listOf(queryPage))
|
mediaClient.getMediaListFromSearch("", 0, 1)
|
||||||
whenever(queryPage.pageId()).thenReturn(0)
|
.test()
|
||||||
val entities: Entities = mock()
|
.assertValues(listOf(media))
|
||||||
whenever(mediaDetailInterface!!.getEntity("M0")).thenReturn(Single.just(entities))
|
}
|
||||||
val entity: Entities.Entity = mock()
|
|
||||||
whenever(entities.entities()).thenReturn(mapOf("id" to entity))
|
@Test
|
||||||
val media: Media = mock()
|
fun `fetchImagesForDepictedItem returns mapped response`() {
|
||||||
|
val (mwQueryResponse, media) = expectSuccessfulMapping()
|
||||||
|
whenever(mediaInterface.fetchImagesForDepictedItem("haswbstatement:${BuildConfig.DEPICTS_PROPERTY}=", "0", "1"))
|
||||||
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
|
mediaClient.fetchImagesForDepictedItem("", 0, 1)
|
||||||
|
.test()
|
||||||
|
.assertValues(listOf(media))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getMedia returns mapped response`() {
|
||||||
|
val (mwQueryResponse, media) = expectSuccessfulMapping()
|
||||||
|
whenever(mediaInterface.getMedia("")).thenReturn(Single.just(mwQueryResponse))
|
||||||
|
mediaClient.getMedia("").test().assertValues(media)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getPictureOfTheDay returns mapped response`() {
|
||||||
|
val (mwQueryResponse, media) = expectSuccessfulMapping()
|
||||||
|
whenever(mediaInterface.getMediaWithGenerator(ArgumentMatchers.startsWith("Template:Potd/")))
|
||||||
|
.thenReturn(Single.just(mwQueryResponse))
|
||||||
|
mediaClient.getPictureOfTheDay().test().assertValues(media)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getPageHtml with null parse result returns empty`() {
|
||||||
|
val mwParseResponse = mock<MwParseResponse>()
|
||||||
|
whenever(mediaInterface.getPageHtml("")).thenReturn(Single.just(mwParseResponse))
|
||||||
|
whenever(mwParseResponse.parse()).thenReturn(null)
|
||||||
|
mediaClient.getPageHtml("").test().assertValues("")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getPageHtml with parse result returns text`() {
|
||||||
|
val mwParseResponse = mock<MwParseResponse>()
|
||||||
|
whenever(mediaInterface.getPageHtml("")).thenReturn(Single.just(mwParseResponse))
|
||||||
|
val mwParseResult = mock<MwParseResult>()
|
||||||
|
whenever(mwParseResponse.parse()).thenReturn(mwParseResult)
|
||||||
|
whenever(mwParseResult.text()).thenReturn("text")
|
||||||
|
mediaClient.getPageHtml("").test().assertValues("text")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getEntities throws exception for empty ids`() {
|
||||||
|
mediaClient.getEntities(emptyList()).test().assertErrorMessage("empty list passed for ids")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `getEntities invokes interface with non empty ids`() {
|
||||||
|
val entities = mock<Entities>()
|
||||||
|
whenever(mediaDetailInterface.getEntity("1|2")).thenReturn(Single.just(entities))
|
||||||
|
mediaClient.getEntities(listOf("1","2")).test().assertValue(entities)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `doesPageContainMedia returns false for empty items`() {
|
||||||
|
val pageMediaListResponse = mock<PageMediaListResponse>()
|
||||||
|
whenever(pageMediaInterface.getMediaList(""))
|
||||||
|
.thenReturn(Single.just(pageMediaListResponse))
|
||||||
|
whenever(pageMediaListResponse.items).thenReturn(emptyList())
|
||||||
|
mediaClient.doesPageContainMedia("").test().assertValue(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `doesPageContainMedia returns true for non empty items`() {
|
||||||
|
val pageMediaListResponse = mock<PageMediaListResponse>()
|
||||||
|
whenever(pageMediaInterface.getMediaList(""))
|
||||||
|
.thenReturn(Single.just(pageMediaListResponse))
|
||||||
|
whenever(pageMediaListResponse.items).thenReturn(listOf(mock()))
|
||||||
|
mediaClient.doesPageContainMedia("").test().assertValue(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun mockQuery(queryReceiver: MwQueryResult.() -> Unit): MwQueryResponse {
|
||||||
|
val mwQueryResponse = mock<MwQueryResponse>()
|
||||||
|
val mwQueryResult = mock<MwQueryResult>()
|
||||||
|
whenever(mwQueryResponse.query()).thenReturn(mwQueryResult)
|
||||||
|
mwQueryResult.queryReceiver()
|
||||||
|
return mwQueryResponse
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun expectResponseWithPageId(expectedId: Int): MwQueryResponse {
|
||||||
|
return mockQuery {
|
||||||
|
val mwQueryPage = mock<MwQueryPage>()
|
||||||
|
whenever(firstPage()).thenReturn(mwQueryPage)
|
||||||
|
whenever(mwQueryPage.pageId()).thenReturn(expectedId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun expectSuccessfulMapping(continuationMap: Map<String, String>? = emptyMap()): Pair<MwQueryResponse, Media> {
|
||||||
|
val media = media()
|
||||||
|
val mwQueryPage = mock<MwQueryPage>()
|
||||||
|
val mwQueryResponse = mockQuery {
|
||||||
|
whenever(pages()).thenReturn(listOf(mwQueryPage, mwQueryPage))
|
||||||
|
whenever(mwQueryPage.pageId()).thenReturn(1, 2)
|
||||||
|
}
|
||||||
|
whenever(mwQueryResponse.continuation()).thenReturn(continuationMap)
|
||||||
|
val entities = mock<Entities>()
|
||||||
|
whenever(mediaDetailInterface.getEntity("M1|M2")).thenReturn(Single.just(entities))
|
||||||
|
val entity = mock<Entities.Entity>()
|
||||||
|
whenever(entities.entities()).thenReturn(mapOf("a" to entity, "b" to entity))
|
||||||
val imageInfo = mock<ImageInfo>()
|
val imageInfo = mock<ImageInfo>()
|
||||||
whenever(queryPage.imageInfo()).thenReturn(imageInfo)
|
whenever(mwQueryPage.imageInfo()).thenReturn(imageInfo, null)
|
||||||
whenever(mediaConverter!!.convert(queryPage, entity, imageInfo)).thenReturn(media)
|
whenever(mediaConverter.convert(mwQueryPage, entity, imageInfo)).thenReturn(media)
|
||||||
return Pair(mockResponse, media)
|
return Pair(mwQueryResponse, media)
|
||||||
}
|
|
||||||
|
|
||||||
@Captor
|
|
||||||
private val continuationCaptor: ArgumentCaptor<Map<String, String>>? = null
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun getMediaListFromCategoryTwice() {
|
|
||||||
val mockContinuation = mapOf(Pair("gcmcontinue", "test"))
|
|
||||||
|
|
||||||
val (mockResponse, media: Media) = expectGetEntitiesAndMediaConversion()
|
|
||||||
`when`(mockResponse.continuation()).thenReturn(mockContinuation)
|
|
||||||
|
|
||||||
`when`(
|
|
||||||
mediaInterface!!.getMediaListFromCategory(
|
|
||||||
ArgumentMatchers.anyString(), ArgumentMatchers.anyInt(),
|
|
||||||
continuationCaptor!!.capture()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
val media1 = mediaClient!!.getMediaListFromCategory("abcde").blockingGet().get(0)
|
|
||||||
val media2 = mediaClient!!.getMediaListFromCategory("abcde").blockingGet().get(0)
|
|
||||||
|
|
||||||
assertEquals(continuationCaptor.allValues[0], emptyMap<String, String>())
|
|
||||||
assertEquals(continuationCaptor.allValues[1], mockContinuation)
|
|
||||||
|
|
||||||
assertEquals(media1, media)
|
|
||||||
assertEquals(media2, media)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun getMediaListForUser() {
|
|
||||||
val mockContinuation = mapOf("gcmcontinue" to "test")
|
|
||||||
|
|
||||||
val (mockResponse, media: Media) = expectGetEntitiesAndMediaConversion()
|
|
||||||
whenever(mockResponse.continuation()).thenReturn(mockContinuation)
|
|
||||||
|
|
||||||
whenever(
|
|
||||||
mediaInterface!!.getMediaListForUser(
|
|
||||||
ArgumentMatchers.anyString(), ArgumentMatchers.anyInt(),
|
|
||||||
continuationCaptor!!.capture()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
val media1 = mediaClient!!.getMediaListForUser("Test").blockingGet().get(0)
|
|
||||||
val media2 = mediaClient!!.getMediaListForUser("Test").blockingGet().get(0)
|
|
||||||
|
|
||||||
verify(mediaInterface, times(2))?.getMediaListForUser(
|
|
||||||
ArgumentMatchers.anyString(),
|
|
||||||
ArgumentMatchers.anyInt(), ArgumentMatchers.anyMap<String, String>()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun getPageHtmlTest() {
|
|
||||||
val mwParseResult = mock(MwParseResult::class.java)
|
|
||||||
|
|
||||||
`when`(mwParseResult.text()).thenReturn("Test")
|
|
||||||
|
|
||||||
val mockResponse = MwParseResponse()
|
|
||||||
mockResponse.setParse(mwParseResult)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.getPageHtml(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
assertEquals("Test", mediaClient!!.getPageHtml("abcde").blockingGet())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun doesPageContainMedia() {
|
|
||||||
val mock = mock(PageMediaListResponse::class.java)
|
|
||||||
whenever(mock.items).thenReturn(listOf<PageMediaListItem>(mock(PageMediaListItem::class.java)))
|
|
||||||
`when`(pageMediaInterface!!.getMediaList(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mock))
|
|
||||||
|
|
||||||
mediaClient!!.doesPageContainMedia("Test").test().assertValue(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun doesPageContainMediaWithNoMedia() {
|
|
||||||
val mock = mock(PageMediaListResponse::class.java)
|
|
||||||
whenever(mock.items).thenReturn(listOf<PageMediaListItem>())
|
|
||||||
`when`(pageMediaInterface!!.getMediaList(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mock))
|
|
||||||
|
|
||||||
mediaClient!!.doesPageContainMedia("Test").test().assertValue(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun getPageHtmlTestNull() {
|
|
||||||
val mockResponse = MwParseResponse()
|
|
||||||
mockResponse.setParse(null)
|
|
||||||
|
|
||||||
`when`(mediaInterface!!.getPageHtml(ArgumentMatchers.anyString()))
|
|
||||||
.thenReturn(Single.just(mockResponse))
|
|
||||||
|
|
||||||
assertEquals("", mediaClient!!.getPageHtml("abcde").blockingGet())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue