From a6e77e3e8f0d01f3d1bf86263fd37cd7692fb58d Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Sat, 30 May 2020 09:24:26 -0700 Subject: [PATCH] For #10848 - Fixes unit tests --- .../java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt | 7 +++++-- .../org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt index 5dd3fd662..66c223285 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt @@ -33,7 +33,10 @@ import org.mozilla.fenix.ext.toTab /** * A RecyclerView ViewHolder implementation for "tab" items. */ -class TabTrayViewHolder(itemView: View) : TabViewHolder(itemView) { +class TabTrayViewHolder( + itemView: View, + val getSelectedTabId: () -> String? = { itemView.context.components.core.store.state.selectedTabId } +) : TabViewHolder(itemView) { private val iconView: ImageView? = itemView.findViewById(R.id.mozac_browser_tabstray_icon) private val titleView: TextView = itemView.findViewById(R.id.mozac_browser_tabstray_title) private val closeView: AppCompatImageButton = itemView.findViewById(R.id.mozac_browser_tabstray_close) @@ -50,7 +53,7 @@ class TabTrayViewHolder(itemView: View) : TabViewHolder(itemView) { override fun bind(tab: Tab, isSelected: Boolean, observable: Observable) { // This is a hack to workaround a bug in a-c. // https://github.com/mozilla-mobile/android-components/issues/7186 - val isSelected2 = tab.id == itemView.context.components.core.store.state.selectedTabId + val isSelected2 = tab.id == getSelectedTabId() this.tab = tab // Basic text diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt index a186b914e..7a8708519 100644 --- a/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabtray/TabTrayViewHolderTest.kt @@ -25,7 +25,7 @@ class TabTrayViewHolderTest { val view = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate( R.layout.tab_tray_item, null, false) - val tabViewHolder = spy(TabTrayViewHolder(view)) + val tabViewHolder = spy(TabTrayViewHolder(view) { null }) doNothing().`when`(tabViewHolder).updateBackgroundColor(false) val extremelyLongUrl = "m".repeat(MAX_URI_LENGTH + 1)