For #1539: Add bookmark multi-select features
Colin Lee
5 years ago
parent
abb76b4bd4
commit
bc1b7e0b43
@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<item
|
||||
android:id="@+id/share_bookmarks_multi_select"
|
||||
android:icon="@drawable/ic_send"
|
||||
android:iconTint="?attr/iconColor"
|
||||
android:title="@string/bookmark_add_folder"
|
||||
app:showAsAction="ifRoom"
|
||||
tools:targetApi="o" />
|
||||
<item
|
||||
android:id="@+id/open_bookmarks_in_new_tabs_multi_select"
|
||||
android:icon="@drawable/ic_new"
|
||||
android:iconTint="?attr/iconColor"
|
||||
android:title="@string/bookmark_menu_open_in_new_tab_button"
|
||||
app:showAsAction="never"
|
||||
tools:targetApi="o" />
|
||||
<item
|
||||
android:id="@+id/open_bookmarks_in_private_tabs_multi_select"
|
||||
android:icon="@drawable/ic_new"
|
||||
android:iconTint="?attr/iconColor"
|
||||
android:title="@string/bookmark_menu_open_in_private_tab_button"
|
||||
app:showAsAction="never"
|
||||
tools:targetApi="o" />
|
||||
<item
|
||||
android:id="@+id/delete_bookmarks_multi_select"
|
||||
android:icon="@drawable/ic_new"
|
||||
android:iconTint="?attr/iconColor"
|
||||
android:title="@string/bookmark_menu_delete_button"
|
||||
app:showAsAction="never"
|
||||
tools:targetApi="o" />
|
||||
</menu>
|
||||
@ -0,0 +1,72 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.fenix.library.bookmarks
|
||||
|
||||
import android.view.ViewGroup
|
||||
import io.mockk.MockKAnnotations
|
||||
import io.mockk.mockk
|
||||
import io.mockk.spyk
|
||||
import io.reactivex.Observer
|
||||
import io.reactivex.observers.TestObserver
|
||||
import mozilla.appservices.places.BookmarkRoot
|
||||
import mozilla.components.concept.storage.BookmarkNode
|
||||
import mozilla.components.concept.storage.BookmarkNodeType
|
||||
import org.junit.jupiter.api.BeforeEach
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.mozilla.fenix.TestUtils
|
||||
import org.mozilla.fenix.mvi.ActionBusFactory
|
||||
import org.mozilla.fenix.mvi.UIView
|
||||
import org.mozilla.fenix.mvi.getManagedEmitter
|
||||
|
||||
class BookmarkComponentTest {
|
||||
|
||||
private lateinit var bookmarkComponent: BookmarkComponentTest.TestBookmarkComponent
|
||||
private lateinit var bookmarkObserver: TestObserver<BookmarkState>
|
||||
private lateinit var emitter: Observer<BookmarkChange>
|
||||
|
||||
@BeforeEach
|
||||
fun setup() {
|
||||
MockKAnnotations.init(this)
|
||||
TestUtils.setRxSchedulers()
|
||||
|
||||
bookmarkComponent = spyk(
|
||||
BookmarkComponentTest.TestBookmarkComponent(mockk(), TestUtils.bus),
|
||||
recordPrivateCalls = true
|
||||
)
|
||||
bookmarkObserver = bookmarkComponent.internalRender(bookmarkComponent.reducer).test()
|
||||
emitter = TestUtils.owner.getManagedEmitter()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `select and deselect a bookmark`() {
|
||||
val itemToSelect = BookmarkNode(BookmarkNodeType.ITEM, "234", "123", 0, "Mozilla", "http://mozilla.org", null)
|
||||
val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "345", "123", 1, null, null, null)
|
||||
val innerFolder = BookmarkNode(BookmarkNodeType.FOLDER, "456", "123", 2, "Web Browsers", null, null)
|
||||
val tree = BookmarkNode(
|
||||
BookmarkNodeType.FOLDER, "123", BookmarkRoot.Mobile.id, 0, "Best Sites", null,
|
||||
listOf(itemToSelect, separator, innerFolder)
|
||||
)
|
||||
|
||||
emitter.onNext(BookmarkChange.Change(tree))
|
||||
emitter.onNext(BookmarkChange.IsSelected(itemToSelect))
|
||||
emitter.onNext(BookmarkChange.IsDeselected(itemToSelect))
|
||||
|
||||
bookmarkObserver.assertSubscribed().awaitCount(2).assertNoErrors()
|
||||
.assertValues(
|
||||
BookmarkState(null, BookmarkState.Mode.Normal),
|
||||
BookmarkState(tree, BookmarkState.Mode.Normal),
|
||||
BookmarkState(tree, BookmarkState.Mode.Selecting(setOf(itemToSelect))),
|
||||
BookmarkState(tree, BookmarkState.Mode.Normal)
|
||||
)
|
||||
}
|
||||
|
||||
@Suppress("MemberVisibilityCanBePrivate")
|
||||
class TestBookmarkComponent(container: ViewGroup, bus: ActionBusFactory) :
|
||||
BookmarkComponent(container, bus) {
|
||||
|
||||
override val uiView: UIView<BookmarkState, BookmarkAction, BookmarkChange>
|
||||
get() = mockk(relaxed = true)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue