mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 04:43:54 +01:00
Add feature to Browse commons via app (#1716)
* Search activity, image search fragment added * Removed explore icon xml * Updated Javadocs for search Activity and Navigation Base Activity * SearchImageItem class updated * Javadocs added for search activity * removed redundant code and added javadocs for search image modules * Javadocs added for updateImageList method * Rename featuredImage to explore * Fixed null query issue * changed cisibility to gone in case of successful Fetch * Consolidate the networking libraries - drop volley in favor of OkHttp * Extracted a few networking related items into a new Dagger module and finished the process of mocking the main component for tests. * Refactoring to extract GpsCategoryModel and ensure single-responsibility-principle is maintained in CategoryApi. * fixed featured image back bug * Localisation updates from https://translatewiki.net. * Javadocs added * Add option to set image as wallpaper (#1535) * Add option to set image as wallpaper * Added java docs * Toast message on setting the wallpaper successfully * Localisation updates from https://translatewiki.net. * SearchHistory Fragment added * Search History Item added * Content Provider, RecentSearchesDao added * Database version changed to 7 and added methods for find, save ,.. * Delete icon deleted * Reverted changes in gradle files * Reverted changes in gradle files 2 * Optimized Improts * reverted refractor for container name * Refactored packagename, changed name to query in POJO class. * Updated lastUsed to lastSearched * Javadocs updated * Check if user has been in search page for 5 seconds if yes then save it to history * If else indentation updated * added import in test * edittext replaced with Searchview * RxSearchview added * Added support for API 21+ * Snackbar removed on success * Improved code * Pagination added * Removed unnecessary toast * Comment added in method * Support for landscape mode added * Fixed screen rotation issue on Explore and Search activity * Clear focus added * Delete all function added in Content Provider and called from fragment * Scrollbar Recyclerview added * Share Icon changed to 32 dp and back button added in explore, search activity. * Removed unnecessary code * Wrote and run tests for Recent Searches (creating db, migrating from versions, deletion, finding,.. * Category Search Fragment added * Adapter factory added * Renderer added * Improvements * Viewpager adapter added * Updated XML * Improvements in category card design * tabs colors changed * renamed images to media * Java docs improved * Javadoc added for setTabs * JavaDoc for ViewPagerAdapter added * Refreshed listview after delete * Added mediaContainer * Fixed ghost issue in image search fragment * Ghost issue for categories fixed * Removed Calling API call onback press * Category Details activity added * Menu added in category details activity * back button added * back button bugs * Improvements in category images fragment * JavaDoc added for some methods * trimming added, Tab layout hided, recent searches refreshed * SubCategory list fragment added, API added to extract subCategory Details * API params updated to get more precise results * Javadocs added for MWAPI method * Pagination removed * Fix API for fetching images inside category * Parent category API added * Fix #1704 * Fix #1704 corrected * Fix #1702 * Fix #1702 and #1704 * added try catch statements * Optimimzed imports * loops replaced with Functions * Javadocs for various methods added * Fix java docs for Dao * Javadocs for various methods added * Fix java docs for Dao * More javadocs added for explore Feature * Javadocs added * Javadocs added * Improvements in indentation (#1739)
This commit is contained in:
Ujjwal Agrawal
neslihanturan
parent
2171b6846d
commit
86878fb62d
70 changed files with 3030 additions and 78 deletions
|
|
@ -38,7 +38,6 @@ class MockCommonsApplicationModule(appContext: Context) : CommonsApplicationModu
|
|||
val accountUtil: AccountUtil = mock()
|
||||
val appSharedPreferences: SharedPreferences = mock()
|
||||
val defaultSharedPreferences: SharedPreferences = mock()
|
||||
val categorySharedPreferences: SharedPreferences = mock()
|
||||
val otherSharedPreferences: SharedPreferences = mock()
|
||||
val uploadController: UploadController = mock()
|
||||
val mockSessionManager: SessionManager = mock()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,307 @@
|
|||
package fr.free.nrw.commons.explore.recentsearches
|
||||
|
||||
import android.content.ContentProviderClient
|
||||
import android.content.ContentValues
|
||||
import android.database.Cursor
|
||||
import android.database.MatrixCursor
|
||||
import android.database.sqlite.SQLiteDatabase
|
||||
import android.os.RemoteException
|
||||
import com.nhaarman.mockito_kotlin.*
|
||||
import fr.free.nrw.commons.BuildConfig
|
||||
import fr.free.nrw.commons.TestCommonsApplication
|
||||
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.BASE_URI
|
||||
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider.uriForId
|
||||
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao.Table.*
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import java.util.*
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
|
||||
class RecentSearchesDaoTest {
|
||||
|
||||
private val columns = arrayOf(COLUMN_ID, COLUMN_NAME, COLUMN_LAST_USED)
|
||||
private val client: ContentProviderClient = mock()
|
||||
private val database: SQLiteDatabase = mock()
|
||||
private val captor = argumentCaptor<ContentValues>()
|
||||
private val queryCaptor = argumentCaptor<Array<String>>()
|
||||
|
||||
private lateinit var testObject: RecentSearchesDao
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
testObject = RecentSearchesDao { client }
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for creating a table for recent Searches
|
||||
*/
|
||||
@Test
|
||||
fun createTable() {
|
||||
onCreate(database)
|
||||
verify(database).execSQL(CREATE_TABLE_STATEMENT)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for deleting table for recent Searches
|
||||
*/
|
||||
@Test
|
||||
fun deleteTable() {
|
||||
onDelete(database)
|
||||
inOrder(database) {
|
||||
verify(database).execSQL(DROP_TABLE_STATEMENT)
|
||||
verify(database).execSQL(CREATE_TABLE_STATEMENT)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 1 to 2 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v1_to_v2() {
|
||||
onUpdate(database, 1, 2)
|
||||
// Table didnt exist before v7
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 2 to 3 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v2_to_v3() {
|
||||
onUpdate(database, 2, 3)
|
||||
// Table didnt exist before v7
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 3 to 4 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v3_to_v4() {
|
||||
onUpdate(database, 3, 4)
|
||||
// Table didnt exist before v7
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 4 to 5 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v4_to_v5() {
|
||||
onUpdate(database, 4, 5)
|
||||
// Table didnt exist before v7
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 5 to 6 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v5_to_v6() {
|
||||
onUpdate(database, 5, 6)
|
||||
// Table didnt exist before v7
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 6 to 7 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v6_to_v7() {
|
||||
onUpdate(database, 6, 7)
|
||||
verify(database).execSQL(CREATE_TABLE_STATEMENT)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from database version 7 to 8 for recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun migrateTableVersionFrom_v7_to_v8() {
|
||||
onUpdate(database, 7, 8)
|
||||
// Table didnt change in version 8
|
||||
verifyZeroInteractions(database)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from creating a row without using ID in recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun createFromCursor() {
|
||||
createCursor(1).let { cursor ->
|
||||
cursor.moveToFirst()
|
||||
testObject.fromCursor(cursor).let {
|
||||
assertEquals(uriForId(1), it.contentUri)
|
||||
assertEquals("butterfly", it.query)
|
||||
assertEquals(123, it.lastSearched.time)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from updating a row using contentUri in recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun saveExistingQuery() {
|
||||
createCursor(1).let {
|
||||
val recentSearch = testObject.fromCursor(it.apply { moveToFirst() })
|
||||
|
||||
testObject.save(recentSearch)
|
||||
|
||||
verify(client).update(eq(recentSearch.contentUri), captor.capture(), isNull(), isNull())
|
||||
captor.firstValue.let { cv ->
|
||||
assertEquals(2, cv.size())
|
||||
assertEquals(recentSearch.query, cv.getAsString(COLUMN_NAME))
|
||||
assertEquals(recentSearch.lastSearched.time, cv.getAsLong(COLUMN_LAST_USED))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for migrating from creating a row using ID in recent Searches Table
|
||||
*/
|
||||
@Test
|
||||
fun saveNewQuery() {
|
||||
val contentUri = RecentSearchesContentProvider.uriForId(111)
|
||||
whenever(client.insert(isA(), isA())).thenReturn(contentUri)
|
||||
val recentSearch = RecentSearch(null, "butterfly", Date(234L))
|
||||
|
||||
testObject.save(recentSearch)
|
||||
|
||||
verify(client).insert(eq(BASE_URI), captor.capture())
|
||||
captor.firstValue.let { cv ->
|
||||
assertEquals(2, cv.size())
|
||||
assertEquals(recentSearch.query, cv.getAsString(COLUMN_NAME))
|
||||
assertEquals(recentSearch.lastSearched.time, cv.getAsLong(COLUMN_LAST_USED))
|
||||
assertEquals(contentUri, recentSearch.contentUri)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking translation exceptions in searching a row from DB using recent search query
|
||||
*/
|
||||
@Test(expected = RuntimeException::class)
|
||||
fun findRecentSearchTranslatesExceptions() {
|
||||
whenever(client.query(any(), any(), any(), any(), anyOrNull())).thenThrow(RemoteException(""))
|
||||
testObject.find("butterfly")
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking data if it's not present in searching a row from DB using recent search query
|
||||
*/
|
||||
@Test
|
||||
fun whenTheresNoDataFindReturnsNull_nullCursor() {
|
||||
whenever(client.query(any(), any(), any(), any(), any())).thenReturn(null)
|
||||
assertNull(testObject.find("butterfly"))
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking data if it's not present in searching a row from DB using recent search query
|
||||
*/
|
||||
@Test
|
||||
fun whenTheresNoDataFindReturnsNull_emptyCursor() {
|
||||
whenever(client.query(any(), any(), any(), any(), any())).thenReturn(createCursor(0))
|
||||
assertNull(testObject.find("butterfly"))
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking if cursor's are closed after use or not
|
||||
*/
|
||||
@Test
|
||||
fun cursorsAreClosedAfterUse() {
|
||||
val mockCursor: Cursor = mock()
|
||||
whenever(client.query(any(), any(), any(), any(), anyOrNull())).thenReturn(mockCursor)
|
||||
whenever(mockCursor.moveToFirst()).thenReturn(false)
|
||||
|
||||
testObject.find("butterfly")
|
||||
|
||||
verify(mockCursor).close()
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking search results after searching a row from DB using recent search query
|
||||
*/
|
||||
@Test
|
||||
fun findRecentSearchQuery() {
|
||||
whenever(client.query(any(), any(), any(), any(), anyOrNull())).thenReturn(createCursor(1))
|
||||
|
||||
val recentSearch = testObject.find("butterfly")
|
||||
assertNotNull(recentSearch)
|
||||
|
||||
assertEquals(uriForId(1), recentSearch?.contentUri)
|
||||
assertEquals("butterfly", recentSearch?.query)
|
||||
assertEquals(123L, recentSearch?.lastSearched?.time)
|
||||
|
||||
verify(client).query(
|
||||
eq(BASE_URI),
|
||||
eq(ALL_FIELDS),
|
||||
eq("$COLUMN_NAME=?"),
|
||||
queryCaptor.capture(),
|
||||
isNull()
|
||||
)
|
||||
assertEquals("butterfly", queryCaptor.firstValue[0])
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking if cursor's are closed after recent search query or not
|
||||
*/
|
||||
@Test
|
||||
fun cursorsAreClosedAfterRecentSearchQuery() {
|
||||
val mockCursor: Cursor = mock()
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), any())).thenReturn(mockCursor)
|
||||
whenever(mockCursor.moveToFirst()).thenReturn(false)
|
||||
|
||||
testObject.recentSearches(1)
|
||||
|
||||
verify(mockCursor).close()
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking when recent searches returns less than the limit
|
||||
*/
|
||||
@Test
|
||||
fun recentSearchesReturnsLessThanLimit() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), any())).thenReturn(createCursor(1))
|
||||
|
||||
val result = testObject.recentSearches(10)
|
||||
|
||||
assertEquals(1, result.size)
|
||||
assertEquals("butterfly", result[0])
|
||||
|
||||
verify(client).query(
|
||||
eq(BASE_URI),
|
||||
eq(ALL_FIELDS),
|
||||
isNull(),
|
||||
queryCaptor.capture(),
|
||||
eq("$COLUMN_LAST_USED DESC")
|
||||
)
|
||||
assertEquals(0, queryCaptor.firstValue.size)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for checking size or list recieved from recent searches
|
||||
*/
|
||||
@Test
|
||||
fun recentSearchesHonorsLimit() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), any())).thenReturn(createCursor(10))
|
||||
|
||||
val result = testObject.recentSearches(5)
|
||||
|
||||
assertEquals(5, result.size)
|
||||
}
|
||||
|
||||
/**
|
||||
* Unit Test for creating entries in recent searches database.
|
||||
* @param rowCount No of rows
|
||||
*/
|
||||
private fun createCursor(rowCount: Int) = MatrixCursor(columns, rowCount).apply {
|
||||
for (i in 0 until rowCount) {
|
||||
addRow(listOf("1", "butterfly", "123"))
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue