mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-28 21:33:53 +01:00
Resolved unit tests
This commit is contained in:
parent
10bbe4149e
commit
420842676b
5 changed files with 17 additions and 17 deletions
|
|
@ -251,8 +251,8 @@ class BookmarkItemsDao @Inject constructor(
|
|||
COLUMN_ID
|
||||
)
|
||||
|
||||
private const val DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS $TABLE_NAME"
|
||||
private const val CREATE_TABLE_STATEMENT = """
|
||||
const val DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS $TABLE_NAME"
|
||||
const val CREATE_TABLE_STATEMENT = """
|
||||
CREATE TABLE $TABLE_NAME (
|
||||
$COLUMN_NAME STRING,
|
||||
$COLUMN_DESCRIPTION STRING,
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ class BookmarkLocationsDao @Inject constructor(
|
|||
}
|
||||
|
||||
@SuppressLint("Range")
|
||||
private fun fromCursor(cursor: Cursor): Place {
|
||||
fun fromCursor(cursor: Cursor): Place {
|
||||
val location = LatLng(
|
||||
cursor.getDouble(cursor.getColumnIndex(Table.COLUMN_LAT)),
|
||||
cursor.getDouble(cursor.getColumnIndex(Table.COLUMN_LONG)),
|
||||
|
|
@ -209,9 +209,9 @@ class BookmarkLocationsDao @Inject constructor(
|
|||
COLUMN_EXISTS
|
||||
)
|
||||
|
||||
private const val DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS $TABLE_NAME"
|
||||
const val DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS $TABLE_NAME"
|
||||
|
||||
private const val CREATE_TABLE_STATEMENT = """
|
||||
const val CREATE_TABLE_STATEMENT = """
|
||||
CREATE TABLE $TABLE_NAME (
|
||||
$COLUMN_NAME STRING PRIMARY KEY,
|
||||
$COLUMN_LANGUAGE STRING,
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ class BookmarkItemsDaoTest {
|
|||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull()))
|
||||
.thenReturn(createCursor(14))
|
||||
|
||||
val result = testObject.allBookmarksItems
|
||||
val result = testObject.getAllBookmarksItems()
|
||||
|
||||
Assert.assertEquals(14, (result.size))
|
||||
}
|
||||
|
|
@ -145,20 +145,20 @@ class BookmarkItemsDaoTest {
|
|||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(
|
||||
RemoteException(""),
|
||||
)
|
||||
testObject.allBookmarksItems
|
||||
testObject.getAllBookmarksItems()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getAllItemsBookmarksReturnsEmptyList_emptyCursor() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull()))
|
||||
.thenReturn(createCursor(0))
|
||||
Assert.assertTrue(testObject.allBookmarksItems.isEmpty())
|
||||
Assert.assertTrue(testObject.getAllBookmarksItems().isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getAllItemsBookmarksReturnsEmptyList_nullCursor() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(null)
|
||||
Assert.assertTrue(testObject.allBookmarksItems.isEmpty())
|
||||
Assert.assertTrue(testObject.getAllBookmarksItems().isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -167,7 +167,7 @@ class BookmarkItemsDaoTest {
|
|||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(mockCursor)
|
||||
whenever(mockCursor.moveToFirst()).thenReturn(false)
|
||||
|
||||
testObject.allBookmarksItems
|
||||
testObject.getAllBookmarksItems()
|
||||
|
||||
verify(mockCursor).close()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import com.nhaarman.mockitokotlin2.mock
|
|||
import com.nhaarman.mockitokotlin2.verify
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import fr.free.nrw.commons.TestCommonsApplication
|
||||
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.BASE_URI
|
||||
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.Companion.BASE_URI
|
||||
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_CATEGORY
|
||||
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_COMMONS_LINK
|
||||
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_DESCRIPTION
|
||||
|
|
@ -149,7 +149,7 @@ class BookMarkLocationDaoTest {
|
|||
fun getAllLocationBookmarks() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(createCursor(14))
|
||||
|
||||
var result = testObject.allBookmarksLocations
|
||||
var result = testObject.getAllBookmarksLocations()
|
||||
|
||||
assertEquals(14, result.size)
|
||||
}
|
||||
|
|
@ -157,19 +157,19 @@ class BookMarkLocationDaoTest {
|
|||
@Test(expected = RuntimeException::class)
|
||||
fun getAllLocationBookmarksTranslatesExceptions() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(RemoteException(""))
|
||||
testObject.allBookmarksLocations
|
||||
testObject.getAllBookmarksLocations()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getAllLocationBookmarksReturnsEmptyList_emptyCursor() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(createCursor(0))
|
||||
assertTrue(testObject.allBookmarksLocations.isEmpty())
|
||||
assertTrue(testObject.getAllBookmarksLocations().isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getAllLocationBookmarksReturnsEmptyList_nullCursor() {
|
||||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(null)
|
||||
assertTrue(testObject.allBookmarksLocations.isEmpty())
|
||||
assertTrue(testObject.getAllBookmarksLocations().isEmpty())
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -178,7 +178,7 @@ class BookMarkLocationDaoTest {
|
|||
whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(mockCursor)
|
||||
whenever(mockCursor.moveToFirst()).thenReturn(false)
|
||||
|
||||
testObject.allBookmarksLocations
|
||||
testObject.getAllBookmarksLocations()
|
||||
|
||||
verify(mockCursor).close()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class BookmarkLocationControllerTest {
|
|||
@Before
|
||||
fun setup() {
|
||||
MockitoAnnotations.initMocks(this)
|
||||
whenever(bookmarkDao!!.allBookmarksLocations)
|
||||
whenever(bookmarkDao!!.getAllBookmarksLocations())
|
||||
.thenReturn(mockBookmarkList)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue