For #20425: Update AC version
This commit is contained in:
parent
c094e1a457
commit
a5a4a7f6d9
|
@ -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<BookmarksStorage>(relaxed = true)
|
||||
val useCase = BookmarksUseCase(storage)
|
||||
val bookmarkNode = mockk<BookmarkNode>()
|
||||
|
||||
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<BookmarksStorage>(relaxed = true)
|
||||
val useCase = BookmarksUseCase(storage)
|
||||
|
||||
coEvery { storage.getRecentBookmarks(any()) }.coAnswers { listOf() }
|
||||
|
||||
val result = useCase.retrieveRecentBookmarks()
|
||||
|
||||
assertEquals(listOf<BookmarkNode>(), result)
|
||||
|
||||
coVerify { storage.getRecentBookmarks(BookmarksUseCase.DEFAULT_BOOKMARKS_TO_RETRIEVE) }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -212,6 +212,7 @@ class SessionControlInteractorTest {
|
|||
position = null,
|
||||
title = null,
|
||||
url = null,
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -67,6 +67,7 @@ class DefaultRecentBookmarksControllerTest {
|
|||
position = null,
|
||||
title = null,
|
||||
url = "https://www.example.com",
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@ class RecentBookmarksFeatureTest {
|
|||
position = null,
|
||||
title = null,
|
||||
url = "https://www.example.com",
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ class RecentBookmarksViewHolderTest {
|
|||
position = null,
|
||||
title = null,
|
||||
url = null,
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -27,6 +27,7 @@ class BookmarkDeselectNavigationListenerTest {
|
|||
position = 0,
|
||||
title = null,
|
||||
url = null,
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
)
|
||||
}
|
||||
|
|
|
@ -34,6 +34,7 @@ class DesktopFoldersTest {
|
|||
title = BookmarkRoot.Root.name,
|
||||
position = 0,
|
||||
url = null,
|
||||
dateAdded = 0,
|
||||
children = null
|
||||
)
|
||||
|
||||
|
|
|
@ -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<Bookma
|
|||
0,
|
||||
title,
|
||||
null,
|
||||
0,
|
||||
children
|
||||
)
|
||||
|
||||
internal fun testSeparator(parentGuid: String) = BookmarkNode(
|
||||
BookmarkNodeType.SEPARATOR, "guid#${Math.random() * 1000}", parentGuid, null, null, null, null
|
||||
BookmarkNodeType.SEPARATOR, "guid#${Math.random() * 1000}", parentGuid, null, null, null, 0, null
|
||||
)
|
||||
|
|
|
@ -42,6 +42,7 @@ class BookmarkNodeViewHolderTest {
|
|||
position = 0,
|
||||
title = "Mozilla",
|
||||
url = "https://www.mozilla.org",
|
||||
dateAdded = 0,
|
||||
children = listOf()
|
||||
)
|
||||
private val folder = BookmarkNode(
|
||||
|
@ -51,6 +52,7 @@ class BookmarkNodeViewHolderTest {
|
|||
position = 0,
|
||||
title = "Folder",
|
||||
url = null,
|
||||
dateAdded = 0,
|
||||
children = listOf()
|
||||
)
|
||||
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
object AndroidComponents {
|
||||
const val VERSION = "92.0.20210722190406"
|
||||
const val VERSION = "92.0.20210725143116"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user