From 4fbe1dcd36e37c24597083712b5669a37a2afcc3 Mon Sep 17 00:00:00 2001
From: Saifuddin <adenwala32@gmail.com>
Date: Tue, 7 Jan 2025 17:47:02 +0530
Subject: [PATCH] Unit tests resolved

---
 .../bookmarks/pictures/BookmarkPicturesDao.kt        |  2 +-
 .../bookmarks/pictures/BookmarkPictureDaoTest.kt     | 12 ++++++------
 .../pictures/BookmarkPicturesControllerTest.kt       |  2 +-
 .../pictures/BookmarkPicturesFragmentUnitTests.kt    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
index ae7cb3f41..63a3800e6 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.kt
@@ -137,7 +137,7 @@ class BookmarkPicturesDao @Inject constructor(
     }
 
     @SuppressLint("Range")
-    private fun fromCursor(cursor: Cursor): Bookmark {
+    fun fromCursor(cursor: Cursor): Bookmark {
         val fileName = cursor.getString(cursor.getColumnIndex(Table.COLUMN_MEDIA_NAME))
         return Bookmark(
             fileName,
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt
index 02668ff1c..a1f8a7afd 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt
@@ -19,7 +19,7 @@ import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import fr.free.nrw.commons.TestCommonsApplication
 import fr.free.nrw.commons.bookmarks.models.Bookmark
-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI
+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.Companion.BASE_URI
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.COLUMN_CREATOR
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.COLUMN_MEDIA_NAME
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.CREATE_TABLE_STATEMENT
@@ -84,7 +84,7 @@ class BookmarkPictureDaoTest {
     fun getAllBookmarks() {
         whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(createCursor(14))
 
-        var result = testObject.allBookmarks
+        var result = testObject.getAllBookmarks()
 
         assertEquals(14, (result.size))
     }
@@ -92,19 +92,19 @@ class BookmarkPictureDaoTest {
     @Test(expected = RuntimeException::class)
     fun getAllBookmarksTranslatesExceptions() {
         whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenThrow(RemoteException(""))
-        testObject.allBookmarks
+        testObject.getAllBookmarks()
     }
 
     @Test
     fun getAllBookmarksReturnsEmptyList_emptyCursor() {
         whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(createCursor(0))
-        assertTrue(testObject.allBookmarks.isEmpty())
+        assertTrue(testObject.getAllBookmarks().isEmpty())
     }
 
     @Test
     fun getAllBookmarksReturnsEmptyList_nullCursor() {
         whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(null)
-        assertTrue(testObject.allBookmarks.isEmpty())
+        assertTrue(testObject.getAllBookmarks().isEmpty())
     }
 
     @Test
@@ -113,7 +113,7 @@ class BookmarkPictureDaoTest {
         whenever(client.query(any(), any(), anyOrNull(), any(), anyOrNull())).thenReturn(mockCursor)
         whenever(mockCursor.moveToFirst()).thenReturn(false)
 
-        testObject.allBookmarks
+        testObject.getAllBookmarks()
 
         verify(mockCursor).close()
     }
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt
index bb0718c27..154a5a9b3 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesControllerTest.kt
@@ -35,7 +35,7 @@ class BookmarkPicturesControllerTest {
     fun setup() {
         MockitoAnnotations.initMocks(this)
         val mockMedia = mockMedia
-        whenever(bookmarkDao!!.allBookmarks)
+        whenever(bookmarkDao!!.getAllBookmarks())
             .thenReturn(mockBookmarkList)
         whenever(
             mediaClient!!.getMedia(
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt
index 03de2638d..8b8bd5bc7 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragmentUnitTests.kt
@@ -162,7 +162,7 @@ class BookmarkPicturesFragmentUnitTests {
     @Test
     @Throws(Exception::class)
     fun testGetAdapter() {
-        fragment.adapter
+        fragment.getAdapter()
     }
 
     @Test