diff --git a/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt b/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt index fcbd33675..57619a395 100644 --- a/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/bookmarks/BookmarksUseCaseTest.kt @@ -13,7 +13,6 @@ import kotlinx.coroutines.test.runBlockingTest import mozilla.appservices.places.BookmarkRoot import mozilla.components.concept.storage.BookmarkNode import mozilla.components.concept.storage.BookmarksStorage -import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test @@ -48,33 +47,4 @@ class BookmarksUseCaseTest { coVerify { storage.addItem(BookmarkRoot.Mobile.id, "https://mozilla.org", "Mozilla", null) } } - - @Test - fun `WHEN recently saved bookmarks exist THEN retrieve the list from storage`() = runBlockingTest { - val storage = mockk(relaxed = true) - val useCase = BookmarksUseCase(storage) - val bookmarkNode = mockk() - - coEvery { storage.getRecentBookmarks(any()) }.coAnswers { listOf(bookmarkNode) } - - val result = useCase.retrieveRecentBookmarks() - - assertEquals(listOf(bookmarkNode), result) - - coVerify { storage.getRecentBookmarks(BookmarksUseCase.DEFAULT_BOOKMARKS_TO_RETRIEVE) } - } - - @Test - fun `WHEN there are no recently saved bookmarks THEN retrieve the empty list from storage`() = runBlockingTest { - val storage = mockk(relaxed = true) - val useCase = BookmarksUseCase(storage) - - coEvery { storage.getRecentBookmarks(any()) }.coAnswers { listOf() } - - val result = useCase.retrieveRecentBookmarks() - - assertEquals(listOf(), result) - - coVerify { storage.getRecentBookmarks(BookmarksUseCase.DEFAULT_BOOKMARKS_TO_RETRIEVE) } - } } diff --git a/app/src/test/java/org/mozilla/fenix/home/SessionControlInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/home/SessionControlInteractorTest.kt index ff130d820..6a1043bae 100644 --- a/app/src/test/java/org/mozilla/fenix/home/SessionControlInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/SessionControlInteractorTest.kt @@ -212,6 +212,7 @@ class SessionControlInteractorTest { position = null, title = null, url = null, + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt index 156048532..f2e391ac3 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt @@ -67,6 +67,7 @@ class DefaultRecentBookmarksControllerTest { position = null, title = null, url = "https://www.example.com", + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/RecentBookmarksFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/RecentBookmarksFeatureTest.kt index fee1c1431..5f4440721 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/RecentBookmarksFeatureTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/RecentBookmarksFeatureTest.kt @@ -40,6 +40,7 @@ class RecentBookmarksFeatureTest { position = null, title = null, url = "https://www.example.com", + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarkItemViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarkItemViewHolderTest.kt index 11b95144e..ce525fe4d 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarkItemViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarkItemViewHolderTest.kt @@ -32,6 +32,7 @@ class RecentBookmarkItemViewHolderTest { position = null, title = "Bookmark Title", url = null, + dateAdded = 0, children = null ) @@ -42,6 +43,7 @@ class RecentBookmarkItemViewHolderTest { position = null, title = "Other Bookmark Title", url = "https://www.example.com", + dateAdded = 0, children = null ) @@ -52,6 +54,7 @@ class RecentBookmarkItemViewHolderTest { position = null, title = null, url = "https://www.github.com", + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolderTest.kt index 7f1556c20..e649b655e 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolderTest.kt @@ -31,6 +31,7 @@ class RecentBookmarksViewHolderTest { position = null, title = null, url = null, + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt index 80e8d9ada..0ee687b77 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt @@ -66,9 +66,9 @@ class BookmarkControllerTest { private val addNewTabUseCase: TabsUseCases.AddNewTabUseCase = mockk(relaxed = true) private val item = - BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null) + BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", 0, null) private val subfolder = - BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, listOf()) + BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, 0, listOf()) private val childItem = BookmarkNode( BookmarkNodeType.ITEM, "987", @@ -76,6 +76,7 @@ class BookmarkControllerTest { 2, "Firefox", "https://www.mozilla.org/en-US/firefox/", + 0, null ) private val tree = BookmarkNode( @@ -85,10 +86,11 @@ class BookmarkControllerTest { 0, "Mobile", null, + 0, listOf(item, item, childItem, subfolder) ) private val root = BookmarkNode( - BookmarkNodeType.FOLDER, BookmarkRoot.Root.id, null, 0, BookmarkRoot.Root.name, null, null + BookmarkNodeType.FOLDER, BookmarkRoot.Root.id, null, 0, BookmarkRoot.Root.name, null, 0, null ) @Before diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt index c21488450..cf822ef2e 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt @@ -27,6 +27,7 @@ class BookmarkDeselectNavigationListenerTest { position = 0, title = null, url = null, + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt index 5f0a409cc..f965d1807 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt @@ -24,14 +24,14 @@ class BookmarkFragmentInteractorTest { private val bookmarkController: DefaultBookmarkController = mockk(relaxed = true) private val metrics: MetricController = mockk(relaxed = true) - private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null) - private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1, null, null, null) - private val subfolder = BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, listOf()) + private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", 0, null) + private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1, null, null, 0, null) + private val subfolder = BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, 0, listOf()) private val tree: BookmarkNode = BookmarkNode( - BookmarkNodeType.FOLDER, "123", null, 0, "Mobile", null, listOf(item, separator, item, subfolder) + BookmarkNodeType.FOLDER, "123", null, 0, "Mobile", null, 0, listOf(item, separator, item, subfolder) ) private val root = BookmarkNode( - BookmarkNodeType.FOLDER, BookmarkRoot.Root.id, null, 0, BookmarkRoot.Root.name, null, null + BookmarkNodeType.FOLDER, BookmarkRoot.Root.id, null, 0, BookmarkRoot.Root.name, null, 0, null ) @Before diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt index 211c1f8ff..257dd50f7 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt @@ -214,9 +214,9 @@ class BookmarkFragmentStoreTest { assertEquals(BookmarkFragmentState.Mode.Syncing, store.state.mode) } - private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null) - private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1, null, null, null) - private val subfolder = BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, listOf()) + private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", 0, null) + private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1, null, null, 0, null) + private val subfolder = BookmarkNode(BookmarkNodeType.FOLDER, "987", "123", 0, "Subfolder", null, 0, listOf()) private val childItem = BookmarkNode( BookmarkNodeType.ITEM, "987", @@ -224,10 +224,11 @@ class BookmarkFragmentStoreTest { 2, "Firefox", "https://www.mozilla.org/en-US/firefox/", + 0, null ) private val tree = BookmarkNode( - BookmarkNodeType.FOLDER, "123", null, 0, "Mobile", null, listOf(item, separator, childItem, subfolder) + BookmarkNodeType.FOLDER, "123", null, 0, "Mobile", null, 0, listOf(item, separator, childItem, subfolder) ) private val newTree = BookmarkNode( BookmarkNodeType.FOLDER, @@ -236,6 +237,7 @@ class BookmarkFragmentStoreTest { 0, "Mobile", null, + 0, listOf(separator, subfolder) ) private val rootFolder = BookmarkNode( @@ -245,6 +247,7 @@ class BookmarkFragmentStoreTest { 0, "Desktop Bookmarks", null, + 0, listOf(subfolder) ) } diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt index 59edae653..06644a5bf 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt @@ -34,6 +34,7 @@ class DesktopFoldersTest { title = BookmarkRoot.Root.name, position = 0, url = null, + dateAdded = 0, children = null ) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt index 3ea5539dc..aa5f368db 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt @@ -87,6 +87,7 @@ internal fun testBookmarkItem(parentGuid: String, url: String, title: String = " 0, title, url, + 0, null ) @@ -97,9 +98,10 @@ internal fun testFolder(guid: String, parentGuid: String?, children: List