For #2346. Enable kotlin warningsAsErrors for feature-awesomebar module.

Author: dector

buildSrc/src/main/java/KotlinCompiler.kt

@@ -18,7 +18,6 @@ object KotlinCompiler {
         "browser-search",
         "browser-storage-sync",
         "feature-accounts",
-        "feature-awesomebar",
         "feature-contextmenu",
         "feature-customtabs",
         "feature-downloads",

components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/AwesomeBarFeatureTest.kt

@@ -9,6 +9,7 @@ import mozilla.components.concept.awesomebar.AwesomeBar
 import mozilla.components.concept.toolbar.Toolbar
 import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
+import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
@@ -19,15 +20,15 @@ import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 
 @RunWith(RobolectricTestRunner::class)
 class AwesomeBarFeatureTest {
+
     @Test
     fun `Feature connects toolbar with awesome bar`() {
         val toolbar: Toolbar = mock()
         val awesomeBar: AwesomeBar = mock()
-        doReturn(View(RuntimeEnvironment.application)).`when`(awesomeBar).asView()
+        doReturn(View(testContext)).`when`(awesomeBar).asView()
 
         var listener: Toolbar.OnEditListener? = null
 
@@ -121,7 +122,7 @@ class AwesomeBarFeatureTest {
 
         verify(awesomeBar, never()).addProviders(any())
 
-        feature.addClipboardProvider(RuntimeEnvironment.application, mock())
+        feature.addClipboardProvider(testContext, mock())
 
         verify(awesomeBar).addProviders(any())
     }

components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/BookmarksStorageSuggestionProviderTest.kt

@@ -20,7 +20,9 @@ import java.util.UUID
 
 @RunWith(RobolectricTestRunner::class)
 class BookmarksStorageSuggestionProviderTest {
-    val bookmarks = testableBookmarksStorage()
+
+    private val bookmarks = testableBookmarksStorage()
+
     private val newItem = BookmarkNode(
         BookmarkNodeType.ITEM, "123", "456", null,
         "Mozilla", "http://www.mozilla.org", null
@@ -119,8 +121,8 @@ class BookmarksStorageSuggestionProviderTest {
                 }
                 // Calculate maxScore so that we can invert our scoring.
                 // Lower Levenshtein distance should produce a higher score.
-                val maxScore = urlMatches.maxBy { it.score }?.score
-                if (maxScore == null) return@synchronized listOf()
+                urlMatches.maxBy { it.score }?.score
+                    ?: return@synchronized listOf()
 
                 // TODO exclude non-matching results entirely? Score that implies complete mismatch.
                 matchedUrls.asSequence().sortedBy { it.value }.map {

components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/ClipboardSuggestionProviderTest.kt

@@ -8,7 +8,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.Bitmap
-import androidx.test.core.app.ApplicationProvider
 import kotlinx.coroutines.runBlocking
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
@@ -18,6 +17,7 @@ import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.support.test.any
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
+import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -32,17 +32,15 @@ import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class ClipboardSuggestionProviderTest {
-    private val context: Context
-        get() { return ApplicationProvider.getApplicationContext() }
 
     private val clipboardManager: ClipboardManager
-        get() { return context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager }
+        get() = testContext.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
 
     @Test
     fun `provider returns empty list by default`() = runBlocking {
         clipboardManager.primaryClip = null
 
-        val provider = ClipboardSuggestionProvider(context, mock())
+        val provider = ClipboardSuggestionProvider(testContext, mock())
 
         provider.onInputStarted()
         val suggestions = provider.onInputChanged("Hello")
@@ -94,7 +92,7 @@ class ClipboardSuggestionProviderTest {
     fun `provider return suggestion on input start`() {
         clipboardManager.primaryClip = ClipData.newPlainText("Test label", "https://www.mozilla.org")
 
-        val provider = ClipboardSuggestionProvider(context, mock())
+        val provider = ClipboardSuggestionProvider(testContext, mock())
         val suggestions = runBlocking { provider.onInputStarted() }
 
         assertEquals(1, suggestions.size)
@@ -118,7 +116,7 @@ class ClipboardSuggestionProviderTest {
     fun `provider should allow customization of title and icon on suggestion`() {
         clipboardManager.primaryClip = ClipData.newPlainText("Test label", "http://mozilla.org")
         val bitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888)
-        val provider = ClipboardSuggestionProvider(context, mock(), title = "My test title", icon = bitmap)
+        val provider = ClipboardSuggestionProvider(testContext, mock(), title = "My test title", icon = bitmap)
 
         val suggestion = runBlocking {
             provider.onInputStarted()
@@ -147,7 +145,7 @@ class ClipboardSuggestionProviderTest {
 
         val useCase = spy(SessionUseCases(sessionManager).loadUrl)
 
-        val provider = ClipboardSuggestionProvider(context, useCase)
+        val provider = ClipboardSuggestionProvider(testContext, useCase)
 
         provider.onInputStarted()
         val suggestions = provider.onInputChanged("Hello")
@@ -165,7 +163,7 @@ class ClipboardSuggestionProviderTest {
 
     @Test
     fun `Provider suggestion should not get cleared when text changes`() {
-        val provider = ClipboardSuggestionProvider(context, mock())
+        val provider = ClipboardSuggestionProvider(testContext, mock())
         assertFalse(provider.shouldClearSuggestions)
     }
 
@@ -188,7 +186,7 @@ class ClipboardSuggestionProviderTest {
     }
 
     private fun getSuggestion(): AwesomeBar.Suggestion? = runBlocking {
-        val provider = ClipboardSuggestionProvider(context, mock())
+        val provider = ClipboardSuggestionProvider(testContext, mock())
 
         provider.onInputStarted()
         val suggestions = provider.onInputChanged("Hello")

components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/HistoryStorageSuggestionProviderTest.kt

@@ -18,6 +18,7 @@ import org.junit.Test
 import org.mockito.Mockito.`when`
 
 class HistoryStorageSuggestionProviderTest {
+
     @Test
     fun `Provider returns empty list when text is empty`() = runBlocking {
         val provider = HistoryStorageSuggestionProvider(mock(), mock())

components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/SearchSuggestionProviderTest.kt

@@ -4,9 +4,6 @@
 
 package mozilla.components.feature.awesomebar.provider
 
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import junit.framework.Assert.assertEquals
 import kotlinx.coroutines.runBlocking
 import mozilla.components.browser.search.SearchEngine
 import mozilla.components.browser.search.SearchEngineManager
@@ -19,8 +16,10 @@ import mozilla.components.support.ktx.android.graphics.drawable.toBitmap
 import mozilla.components.support.test.any
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
+import mozilla.components.support.test.robolectric.testContext
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -32,14 +31,11 @@ import org.mockito.Mockito.never
 import org.mockito.Mockito.spy
 import org.mockito.Mockito.verify
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 
 private const val GOOGLE_MOCK_RESPONSE = "[\"firefox\",[\"firefox\",\"firefox for mac\",\"firefox quantum\",\"firefox update\",\"firefox esr\",\"firefox focus\",\"firefox addons\",\"firefox extensions\",\"firefox nightly\",\"firefox clear cache\"]]"
 
 @RunWith(RobolectricTestRunner::class)
 class SearchSuggestionProviderTest {
-    private val context: Context
-        get() = ApplicationProvider.getApplicationContext()
 
     @Test
     fun `Provider returns suggestion with chips based on search engine suggestion`() {
@@ -58,7 +54,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)
@@ -114,7 +110,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)
@@ -174,7 +170,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)
@@ -223,7 +219,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)
@@ -258,7 +254,7 @@ class SearchSuggestionProviderTest {
             server.start()
 
             val searchEngine: SearchEngine = mock()
-            val engineIcon = context.getDrawable(R.drawable.mozac_ic_device_desktop)!!.toBitmap()
+            val engineIcon = testContext.getDrawable(R.drawable.mozac_ic_device_desktop)!!.toBitmap()
 
             doReturn(engineIcon).`when`(searchEngine).icon
             doReturn("/").`when`(searchEngine).buildSuggestionsURL("fire")
@@ -284,14 +280,14 @@ class SearchSuggestionProviderTest {
             server.start()
 
             val searchEngine: SearchEngine = mock()
-            val engineIcon = context.getDrawable(R.drawable.mozac_ic_device_desktop)!!.toBitmap()
+            val engineIcon = testContext.getDrawable(R.drawable.mozac_ic_device_desktop)!!.toBitmap()
 
             doReturn(engineIcon).`when`(searchEngine).icon
             doReturn("/").`when`(searchEngine).buildSuggestionsURL("fire")
             doReturn(true).`when`(searchEngine).canProvideSearchSuggestions
             doReturn("google").`when`(searchEngine).name
 
-            val paramIcon = context.getDrawable(R.drawable.mozac_ic_search)!!.toBitmap()
+            val paramIcon = testContext.getDrawable(R.drawable.mozac_ic_search)!!.toBitmap()
 
             val provider = SearchSuggestionProvider(searchEngine, mock(), HttpURLConnectionClient(),
                     icon = paramIcon)
@@ -354,7 +350,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)
@@ -388,7 +384,7 @@ class SearchSuggestionProviderTest {
             doReturn(searchEngine).`when`(searchEngineManager).getDefaultSearchEngine(any(), any())
 
             val useCase = spy(SearchUseCases(
-                RuntimeEnvironment.application,
+                testContext,
                 searchEngineManager,
                 SessionManager(mock()).apply { add(Session("https://www.mozilla.org")) }
             ).defaultSearch)