From 420842676b71290f94680e289b5e2a4cb2e5bde8 Mon Sep 17 00:00:00 2001 From: Saifuddin Date: Tue, 7 Jan 2025 17:28:34 +0530 Subject: [PATCH] Resolved unit tests --- .../nrw/commons/bookmarks/items/BookmarkItemsDao.kt | 4 ++-- .../bookmarks/locations/BookmarkLocationsDao.kt | 6 +++--- .../commons/bookmarks/items/BookmarkItemsDaoTest.kt | 10 +++++----- .../bookmarks/locations/BookMarkLocationDaoTest.kt | 12 ++++++------ .../locations/BookmarkLocationControllerTest.kt | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt index e4bbbd733..d957e2992 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt @@ -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, diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt index 26b32c0dd..d2748ad3a 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt @@ -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, diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt index 60ae7869d..27c937826 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDaoTest.kt @@ -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() } diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt index 391dd8d17..f2acf4eaf 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt @@ -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() } diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt index 3fd21c25f..262489ba5 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationControllerTest.kt @@ -20,7 +20,7 @@ class BookmarkLocationControllerTest { @Before fun setup() { MockitoAnnotations.initMocks(this) - whenever(bookmarkDao!!.allBookmarksLocations) + whenever(bookmarkDao!!.getAllBookmarksLocations()) .thenReturn(mockBookmarkList) }