Add tab favicon and renderer unit tests

Author: subsymbolic

app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionKtTest.kt

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.tabs.ui
+
+import android.support.test.InstrumentationRegistry
+import com.duckduckgo.app.tabs.model.TabEntity
+import org.junit.Assert.*
+import org.junit.Test
+
+class TabRendererExtensionTest {
+
+    private val context = InstrumentationRegistry.getTargetContext()
+
+    @Test
+    fun whenTabIsBlankThenDisplayTitleIsDuckDuckGo() {
+        assertEquals("DuckDuckGo", TabEntity("").displayTitle(context))
+    }
+
+    @Test
+    fun whenTabHasTitleThenDisplayTitleIsSame() {
+        assertEquals(TITLE, TabEntity("", URL, TITLE).displayTitle(context))
+    }
+
+    @Test
+    fun whenTabDoesNotHaveTitleThenDisplayTitleIsUrlHost() {
+        assertEquals("example.com", TabEntity("", URL, null).displayTitle(context))
+    }
+
+    @Test
+    fun whenTabDoesNotHaveTitleAndUrlIsInvalidThenTitleIsBlank() {
+        assertEquals("", TabEntity("", INVALID_URL, null).displayTitle(context))
+    }
+
+    @Test
+    fun whenTabIsBlankThenUrlIsDuckDuckGo() {
+        assertEquals("https://duckduckgo.com", TabEntity("").displayUrl())
+    }
+
+    @Test
+    fun whenTabHasUrlThenDisplayUrlIsSame() {
+        assertEquals(URL, TabEntity("", URL, TITLE).displayUrl())
+    }
+
+    @Test
+    fun whenTabDoesNotHaveAUrlThenDisplayUrlIsBlank() {
+        assertEquals("", TabEntity("", null, TITLE).displayUrl())
+    }
+
+    @Test
+    fun whenTabHasUrlThenFaviconIsNotNull() {
+        assertNotNull(TabEntity("", URL, TITLE).favicon())
+    }
+
+    @Test
+    fun whenTabDoesNotHaveAUrlThenFaviconIsNull() {
+        assertNull(TabEntity("", null, TITLE).favicon())
+    }
+
+    @Test
+    fun whenTabHasInvalidUrlThenFaviconIsNull() {
+        assertNull(TabEntity("", INVALID_URL, TITLE).favicon())
+    }
+
+    companion object {
+        private const val TITLE = "Title"
+        private const val URL = "https://example.com"
+        private const val INVALID_URL = "notaurl"
+
+    }
+}

app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.tabs.ui
+
+import android.content.Context
+import android.net.Uri
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.global.AppUrl
+import com.duckduckgo.app.global.faviconLocation
+import com.duckduckgo.app.tabs.model.TabEntity
+
+val TabEntity.isBlank: Boolean
+    get() = title == null && url == null
+
+fun TabEntity.displayTitle(context: Context): String {
+    if (isBlank) {
+        return context.getString(R.string.homeTab)
+    }
+
+    return title ?: Uri.parse(resolvedUrl()).host ?: ""
+}
+
+private fun TabEntity.resolvedUrl(): String {
+    return if (isBlank) AppUrl.Url.HOME else url ?: ""
+}
+
+fun TabEntity.displayUrl(): String {
+    return resolvedUrl()
+}
+
+fun TabEntity.favicon(): Uri? {
+    return Uri.parse(resolvedUrl())?.faviconLocation()
+}

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

@@ -17,7 +17,6 @@
 package com.duckduckgo.app.tabs.ui
 
 import android.content.Context
-import android.net.Uri
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.RecyclerView.Adapter
 import android.view.LayoutInflater
@@ -26,7 +25,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.global.AppUrl
+import com.duckduckgo.app.global.image.GlideApp
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.ui.TabSwitcherAdapter.TabViewHolder
 import kotlinx.android.synthetic.main.item_tab.view.*
@@ -46,14 +45,21 @@ class TabSwitcherAdapter(private val context: Context, private val itemClickList
     }
 
     override fun onBindViewHolder(holder: TabViewHolder, position: Int) {
+
         val tab = data[position]
-        if (tab.title == null && tab.url == null) {
-            holder.title.text = context.getText(R.string.homeTab)
-            holder.url.text = AppUrl.Url.HOME
-        } else {
-            holder.url.text = tab.url ?: ""
-            holder.title.text = tab.title ?: Uri.parse(tab.url).host ?: ""
-        }
+        holder.title.text = tab.displayTitle(context)
+        holder.url.text = tab.displayUrl()
+
+        GlideApp.with(holder.root)
+            .load(tab.favicon())
+            .placeholder(R.drawable.ic_globe_gray_16dp)
+            .error(R.drawable.ic_globe_gray_16dp)
+            .into(holder.favicon)
+
+        attachClickListeners(holder, tab)
+    }
+
+    private fun attachClickListeners(holder: TabViewHolder, tab: TabEntity) {
         holder.root.setOnClickListener {
             itemClickListener.onTabSelected(tab)
         }