For #2346. Enable kotlin warningsAsErrors for `feature-downloads` module. (9ce405c8) · Commits · The Tor Project / Applications / android-components

buildSrc/src/main/java/KotlinCompiler.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ object KotlinCompiler {
		"browser-domains",
		"browser-storage-sync",
		"feature-accounts",
		"feature-downloads",
		"feature-prompts",
		"feature-search",
		"service-glean",

components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,10 @@ class DownloadsFeature(
		* Notifies the feature that the permissions request was completed. It will then
		* either trigger or clear the pending download.
		*/
		fun onPermissionsResult(permissions: Array<String>, grantResults: IntArray) {
		fun onPermissionsResult(
		@Suppress("UNUSED_PARAMETER") permissions: Array<String>,
		@Suppress("UNUSED_PARAMETER") grantResults: IntArray
		) {
		if (applicationContext.isPermissionGranted(INTERNET, WRITE_EXTERNAL_STORAGE)) {
		activeSession?.let { session ->
		session.download.consume {

components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -4,10 +4,10 @@

		package mozilla.components.feature.downloads

		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertNotNull
		import mozilla.components.browser.session.Download
		import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.KEY_FILE_NAME
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertNotNull
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -21,7 +21,6 @@ class DownloadDialogFragmentTest {

		@Before
		fun setup() {

		dialog = object : DownloadDialogFragment() {}
		download = Download(
		"http://ipv4.download.thinkbroadband.com/5MB.zip",

components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadManagerTest.kt

+3 −6

Original line number	Diff line number	Diff line
		@@ -8,12 +8,11 @@ import android.Manifest.permission.INTERNET
		import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
		import android.app.DownloadManager.ACTION_DOWNLOAD_COMPLETE
		import android.app.DownloadManager.Request
		import android.content.Context
		import android.content.Intent
		import androidx.test.core.app.ApplicationProvider
		import mozilla.components.browser.session.Download
		import mozilla.components.support.test.mock
		import mozilla.components.support.test.robolectric.grantPermission
		import mozilla.components.support.test.robolectric.testContext
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertFalse
		import org.junit.Before
		@@ -29,8 +28,6 @@ class DownloadManagerTest {

		private lateinit var download: Download
		private lateinit var downloadManager: DownloadManager
		private val context: Context
		get() = ApplicationProvider.getApplicationContext()

		@Before
		fun setup() {
		@@ -39,7 +36,7 @@ class DownloadManagerTest {
		"", "application/zip", 5242880,
		"Mozilla/5.0 (Linux; Android 7.1.1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/8.0 Chrome/69.0.3497.100 Mobile Safari/537.36"
		)
		downloadManager = DownloadManager(context)
		downloadManager = DownloadManager(testContext)
		}

		@Test(expected = SecurityException::class)
		@@ -126,7 +123,7 @@ class DownloadManagerTest {
		private fun notifyDownloadCompleted(id: Long) {
		val intent = Intent(ACTION_DOWNLOAD_COMPLETE)
		intent.putExtra(android.app.DownloadManager.EXTRA_DOWNLOAD_ID, id)
		context.sendBroadcast(intent)
		testContext.sendBroadcast(intent)
		}

		private fun grantPermissions() {

components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt

+22 −17

Original line number	Diff line number	Diff line
		@@ -6,11 +6,8 @@ package mozilla.components.feature.downloads

		import android.Manifest.permission.INTERNET
		import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
		import android.content.Context
		import androidx.core.content.PermissionChecker
		import androidx.fragment.app.FragmentManager
		import androidx.test.core.app.ApplicationProvider
		import org.junit.Assert.assertTrue
		import mozilla.components.browser.session.Download
		import mozilla.components.browser.session.Session
		import mozilla.components.browser.session.SessionManager
		@@ -18,22 +15,24 @@ import mozilla.components.concept.engine.Engine
		import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG
		import mozilla.components.support.base.observer.Consumable
		import mozilla.components.support.test.any
		import mozilla.components.support.test.robolectric.grantPermission
		import mozilla.components.support.test.mock
		import mozilla.components.support.test.robolectric.grantPermission
		import mozilla.components.support.test.robolectric.testContext
		import org.junit.Assert.assertNotNull
		import org.junit.Assert.assertNull
		import org.junit.Assert.assertTrue
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.anyString
		import org.mockito.Mockito.`when`
		import org.mockito.Mockito.doReturn
		import org.mockito.Mockito.spy
		import org.mockito.Mockito.mock
		import org.mockito.Mockito.`when`
		import org.mockito.Mockito.never
		import org.mockito.Mockito.spy
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verifyNoMoreInteractions
		import org.mockito.Mockito.verify
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verifyNoMoreInteractions
		import org.robolectric.RobolectricTestRunner

		@RunWith(RobolectricTestRunner::class)
		@@ -42,20 +41,21 @@ class DownloadsFeatureTest {
		private lateinit var feature: DownloadsFeature
		private lateinit var mockDownloadManager: DownloadManager
		private lateinit var mockSessionManager: SessionManager
		private val context = ApplicationProvider.getApplicationContext<Context>()

		@Before
		fun setup() {
		val engine = mock(Engine::class.java)
		mockSessionManager = spy(SessionManager(engine))
		mockDownloadManager = mock()
		feature = DownloadsFeature(context, downloadManager = mockDownloadManager, sessionManager = mockSessionManager)
		feature = DownloadsFeature(testContext,
		downloadManager = mockDownloadManager,
		sessionManager = mockSessionManager)
		}

		@Test
		fun `when valid sessionId is provided, observe it's session`() {
		feature = spy(DownloadsFeature(
		context,
		testContext,
		downloadManager = mockDownloadManager,
		sessionManager = mockSessionManager,
		sessionId = "123"
		@@ -71,7 +71,7 @@ class DownloadsFeatureTest {
		@Test
		fun `when sessionId is NOT provided, observe selected session`() {
		feature = spy(DownloadsFeature(
		context,
		testContext,
		downloadManager = mockDownloadManager,
		sessionManager = mockSessionManager
		))
		@@ -193,8 +193,11 @@ class DownloadsFeatureTest {

		val featureWithDialog =
		DownloadsFeature(
		context, downloadManager = mockDownloadManager, sessionManager = mockSessionManager,
		fragmentManager = mockFragmentManager, dialog = mockDialog
		testContext,
		downloadManager = mockDownloadManager,
		sessionManager = mockSessionManager,
		fragmentManager = mockFragmentManager,
		dialog = mockDialog
		)

		grantPermissions()
		@@ -223,7 +226,7 @@ class DownloadsFeatureTest {

		val feature =
		DownloadsFeature(
		context,
		testContext,
		downloadManager = mockDownloadManager,
		sessionId = "sessionId",
		sessionManager = mockSessionManager,
		@@ -251,7 +254,7 @@ class DownloadsFeatureTest {

		val feature =
		DownloadsFeature(
		context,
		testContext,
		downloadManager = mockDownloadManager,
		sessionId = "sessionId",
		sessionManager = mockSessionManager,
		@@ -272,7 +275,9 @@ class DownloadsFeatureTest {

		val featureWithDialog =
		DownloadsFeature(
		context, downloadManager = mockDownloadManager, sessionManager = mockSessionManager,
		testContext,
		downloadManager = mockDownloadManager,
		sessionManager = mockSessionManager,
		fragmentManager = mockFragmentManager
		)