blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #9605: replace unit test runners with FenixRobolectricTestRunner. 

This is how we can apply the new test runner to remove duplication.

This commit was generated programmatically with the following commands:
```
  // Replace test runners with new one.
  find app/src/test -type f -exec gsed -i "s/@RunWith(RobolectricTestRunner::class)/@RunWith(FenixRobolectricTestRunner::class)/" {} +
  find app/src/test -type f -exec gsed -i "s/@RunWith(AndroidJUnit4::class)/@RunWith(FenixRobolectricTestRunner::class)/" {} +

  // Replace imports of old test runners with new one
  find app/src/test -type f -exec gsed -i "s/org.robolectric.RobolectricTestRunner/org.mozilla.fenix.helpers.FenixRobolectricTestRunner/" {} +
  find app/src/test -type f -exec gsed -i "s/androidx.test.ext.junit.runners.AndroidJUnit4/org.mozilla.fenix.helpers.FenixRobolectricTestRunner/" {} +

  // Remove unused imports
  find app/src/test -type f -exec gsed -i "/@Config(application = TestApplication::class)/d" {} +
  find app/src/test -type f -exec gsed -i "/import org.mozilla.fenix.TestApplication/d" {} +
  find app/src/test -type f -exec gsed -i "/import org.robolectric.annotation.Config/d" {} +
```

Where gsed is the GNU version of sed installed via homebrew. After
running these commands, I need to manually clean up the following files:
- FenixRobolectricTestRunner
- LocaleManagerExtensionTest
master
Michael Comella 2020-04-01 14:00:32 -07:00 committed by Michael Comella
parent b0cfa3ee5c
commit 6e0d851da3
51 changed files with 102 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt
View File

@ -21,11 +21,9 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.AppRequestInterceptor.Companion.HIGH_RISK_ERROR_PAGES
import org.mozilla.fenix.AppRequestInterceptor.Companion.LOW_AND_MEDIUM_RISK_ERROR_PAGES
import org.mozilla.fenix.ext.isOnline
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class AppRequestInterceptorTest {
private lateinit var interceptor: RequestInterceptor

6
app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
View File

@ -16,11 +16,9 @@ import org.mozilla.fenix.HomeActivity.Companion.PRIVATE_BROWSING_MODE
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.settings
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class HomeActivityTest {
@Test

6
app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt
View File

@ -22,13 +22,11 @@ import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.shortcut.NewTabShortcutIntentProcessor
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
@ExperimentalCoroutinesApi
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class IntentReceiverActivityTest {
@Test

7
app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt
View File

@ -4,7 +4,7 @@
package org.mozilla.fenix.collections
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import assertk.assertThat
import assertk.assertions.isNotNull
import assertk.assertions.isNull
@ -27,8 +27,6 @@ import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.annotation.Config
private const val URL_MOZILLA = "www.mozilla.org"
private const val SESSION_ID_MOZILLA = "0"
@ -40,8 +38,7 @@ private const val SESSION_ID_BAD_2 = "definitely not a real session id"
@ExperimentalCoroutinesApi
@ObsoleteCoroutinesApi
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class CollectionCreationFragmentTest {
@MockK private lateinit var sessionManager: SessionManager

7
app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt
View File

@ -4,7 +4,7 @@
package org.mozilla.fenix.components
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.runBlocking
import mozilla.components.lib.crash.CrashReporter
@ -18,12 +18,9 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.Mockito.verify
import org.mozilla.fenix.TestApplication
import org.robolectric.annotation.Config
import kotlin.reflect.KClass
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class AccountAbnormalitiesTest {
@Test
fun `account manager must be configured`() {

7
app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt
View File

@ -16,14 +16,11 @@ import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity
import org.mozilla.fenix.ext.components
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class IntentProcessorTypeTest {
@Test

7
app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt
View File

@ -14,12 +14,9 @@ import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class StoreProviderTest {
private class BasicState : State

7
app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt
View File

@ -11,13 +11,10 @@ import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.utils.Settings
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class TrackingProtectionPolicyFactoryTest {
@Test

7
app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt
View File

@ -16,12 +16,9 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.GleanMetrics.Metrics
import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class GleanMetricsServiceTest {
@get:Rule
val gleanRule = GleanTestRule(testContext)

7
app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt
View File

@ -7,12 +7,9 @@ import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class MetricsUtilsTest {
@Test

7
app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt
View File

@ -13,15 +13,12 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.metrics.Event.PerformedSearch
import org.mozilla.fenix.components.metrics.Event.PerformedSearch.EngineSource
import org.mozilla.fenix.components.metrics.Event.PerformedSearch.EventSource
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class PerformedSearchTest {
private lateinit var searchEngines: List<SearchEngine>

7
app/src/test/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProviderTest.kt
View File

@ -17,13 +17,10 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ExperimentalCoroutinesApi
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class FenixSearchEngineProviderTest {
private lateinit var fenixSearchEngineProvider: FenixSearchEngineProvider

7
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
View File

@ -39,7 +39,6 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.browser.BrowserAnimator
import org.mozilla.fenix.browser.BrowserFragment
import org.mozilla.fenix.browser.BrowserFragmentDirections
@ -57,12 +56,10 @@ import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.ext.toTab
import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ExperimentalCoroutinesApi
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DefaultBrowserToolbarControllerTest {
private val mainThreadSurrogate = newSingleThreadContext("UI thread")

7
app/src/test/java/org/mozilla/fenix/customtabs/PoweredByNotificationTest.kt
View File

@ -13,12 +13,9 @@ import mozilla.components.support.test.mock
import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class PoweredByNotificationTest {
@Test

7
app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt
View File

@ -11,14 +11,11 @@ import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class ActivityTest {
@Test

7
app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt
View File

@ -13,12 +13,9 @@ import mozilla.components.browser.icons.IconRequest
import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class BrowserIconsTest {
@Test
fun loadIntoViewTest() {

7
app/src/test/java/org/mozilla/fenix/ext/ConnectivityManagerTest.kt
View File

@ -15,12 +15,9 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class ConnectivityManagerTest {
private lateinit var connectivityManager: ConnectivityManager

7
app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt
View File

@ -12,12 +12,9 @@ import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DrawableTest {
@Test
fun testSetBounds() {

7
app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt
View File

@ -23,12 +23,9 @@ import mozilla.components.support.test.robolectric.testContext
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class FragmentTest {
private val navDirections: NavDirections = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt
View File

@ -6,18 +6,15 @@ package org.mozilla.fenix.ext
import android.view.View
import mozilla.components.support.test.robolectric.testContext
import org.mozilla.fenix.TestApplication
import org.junit.Test
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Assert.assertEquals
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import android.widget.ImageButton
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class ImageButtonTest {
private val imageButton = ImageButton(testContext)

7
app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
View File

@ -15,15 +15,12 @@ import org.junit.Assert.assertEquals
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
const val PUNYCODE = "xn--kpry57d"
const val IDN = "台灣"
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class StringTest {
private val publicSuffixList = testContext.components.publicSuffixList

7
app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt
View File

@ -14,12 +14,9 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.`when`
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class TabCollectionTest {
@Test

7
app/src/test/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessorTest.kt
View File

@ -13,12 +13,9 @@ import io.mockk.verify
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class CrashReporterIntentProcessorTest {
@Test

7
app/src/test/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt
View File

@ -18,13 +18,10 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DeepLinkIntentProcessorTest {
private lateinit var activity: HomeActivity

7
app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt
View File

@ -25,14 +25,11 @@ import mozilla.components.feature.intent.ext.getSessionId
import mozilla.components.feature.session.SessionUseCases
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.home.intent.FennecBookmarkShortcutsIntentProcessor.Companion.ACTION_FENNEC_HOMESCREEN_SHORTCUT
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import java.util.UUID
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class FennecBookmarkShortcutsIntentProcessorTest {
private val sessionManager = mockk<SessionManager>(relaxed = true)
private val loadUrlUseCase = mockk<SessionUseCases.DefaultLoadUrlUseCase>(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt
View File

@ -13,12 +13,9 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class OpenBrowserIntentProcessorTest {
private val activity: HomeActivity = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt
View File

@ -14,15 +14,12 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class SpeechProcessingIntentProcessorTest {
private val activity: HomeActivity = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
View File

@ -13,14 +13,11 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class StartSearchIntentProcessorTest {
private val metrics: MetricController = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt
View File

@ -12,12 +12,9 @@ import mozilla.components.concept.storage.BookmarkNodeType
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
internal class BookmarkAdapterTest {
private lateinit var bookmarkAdapter: BookmarkAdapter

7
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt
View File

@ -15,12 +15,9 @@ import mozilla.components.concept.storage.BookmarkNodeType
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class BookmarkDeselectNavigationListenerTest {
private val basicNode = BookmarkNode(

7
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarksSharedViewModelTest.kt
View File

@ -16,12 +16,9 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
internal class BookmarksSharedViewModelTest {
private lateinit var viewModel: BookmarksSharedViewModel

7
app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt
View File

@ -21,13 +21,10 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.components
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DesktopFoldersTest {
private lateinit var context: Context

7
app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt
View File

@ -24,15 +24,12 @@ import org.junit.Assert.assertFalse
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.components.FenixSnackbar
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
// Robolectric needed for `onShareItem()`
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class HistoryControllerTest {
private val historyItem = HistoryItem(0, "title", "url", 0.toLong())
private val store: HistoryFragmentStore = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt
View File

@ -7,7 +7,7 @@ package org.mozilla.fenix.search
import androidx.lifecycle.LifecycleCoroutineScope
import androidx.navigation.NavController
import androidx.navigation.NavDirections
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
@ -25,7 +25,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.components
@ -36,11 +35,9 @@ import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.search.DefaultSearchController.Companion.KEYBOARD_ANIMATION_DELAY
import org.mozilla.fenix.utils.Settings
import org.mozilla.fenix.whatsnew.clear
import org.robolectric.annotation.Config
@ExperimentalCoroutinesApi
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DefaultSearchControllerTest {
private val context: HomeActivity = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/session/NotificationSessionObserverTest.kt
View File

@ -9,13 +9,10 @@ import mozilla.components.support.test.robolectric.testContext
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.browser.session.Session
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class NotificationSessionObserverTest {
private lateinit var observer: NotificationSessionObserver

7
app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt
View File

@ -18,13 +18,10 @@ import kotlinx.android.synthetic.main.about_list_item.view.*
import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.settings.about.viewholders.AboutItemViewHolder
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class AboutPageAdapterTest {
private var aboutList: List<AboutPageItem> =
mutableListOf(

6
app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtensionTest.kt
View File

@ -17,13 +17,11 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.TestApplication
import org.robolectric.RobolectricTestRunner
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.robolectric.annotation.Config
import java.util.Locale
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class LocaleManagerExtensionTest {
@Before

7
app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt
View File

@ -6,7 +6,7 @@
package org.mozilla.fenix.settings.deletebrowsingdata
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
@ -27,17 +27,14 @@ import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.PermissionStorage
import org.mozilla.fenix.ext.clearAndCommit
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.utils.Settings
import org.robolectric.annotation.Config
@ExperimentalCoroutinesApi
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DeleteAndQuitTest {
private val mainThreadSurrogate = newSingleThreadContext("UI thread")

7
app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt
View File

@ -32,18 +32,15 @@ import mozilla.components.support.test.robolectric.testContext
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.PermissionStorage
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled
import org.mozilla.fenix.settings.toggle
import org.mozilla.fenix.utils.Settings
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ExperimentalCoroutinesApi
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class DefaultQuickSettingsControllerTest {
private val context = testContext
private val store = mockk<QuickSettingsFragmentStore>()

7
app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt
View File

@ -25,7 +25,6 @@ import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.quicksettings.QuickSettingsFragmentStore.Companion.getInsecureWebsiteUiValues
@ -36,11 +35,9 @@ import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled
import org.mozilla.fenix.settings.quicksettings.ext.shouldBeVisible
import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_ALL
import org.mozilla.fenix.utils.Settings
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class QuickSettingsFragmentStoreTest {
private val context = spyk(testContext)
private val permissions = mockk<SitePermissions>()

7
app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
View File

@ -36,18 +36,15 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.metrics
import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.share.listadapters.AppShareOption
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
@ExperimentalCoroutinesApi
class ShareControllerTest {
// Need a valid context to retrieve Strings for example, but we also need it to return our "metrics"

7
app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt
View File

@ -30,18 +30,15 @@ import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.application
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.isOnline
import org.mozilla.fenix.share.ShareViewModel.Companion.RECENT_APPS_LIMIT
import org.mozilla.fenix.share.listadapters.AppShareOption
import org.mozilla.fenix.share.listadapters.SyncShareOption
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
@ExperimentalCoroutinesApi
class ShareViewModelTest {

7
app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt
View File

@ -16,14 +16,11 @@ import io.mockk.verify
import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.share.ShareInteractor
import org.mozilla.fenix.share.viewholders.AccountDeviceViewHolder
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class AccountDevicesShareAdapterTest {
private val interactor: ShareInteractor = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt
View File

@ -17,14 +17,11 @@ import io.mockk.verifyOrder
import mozilla.components.support.test.robolectric.testContext
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.share.ShareInteractor
import org.mozilla.fenix.share.viewholders.AppViewHolder
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class AppShareAdapterTest {
private val appOptions = mutableListOf(

7
app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt
View File

@ -16,13 +16,10 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.R
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.utils.Settings
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class TrackingProtectionOverlayTest {
private lateinit var context: Context

7
app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt
View File

@ -10,7 +10,7 @@ import android.content.pm.ActivityInfo
import android.content.pm.PackageInfo
import android.content.pm.ResolveInfo
import android.net.Uri
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.support.test.robolectric.testContext
import mozilla.components.support.utils.Browsers
import org.junit.Assert.assertEquals
@ -18,12 +18,9 @@ import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class BrowsersCacheTest {
// NB: There is always one more browser than pretendBrowsersAreInstalled installs because

7
app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt
View File

@ -7,17 +7,14 @@ package org.mozilla.fenix.utils
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class ClipboardHandlerTest {
private val clipboardUrl = "https://www.mozilla.org"

7
app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
View File

@ -4,7 +4,7 @@
package org.mozilla.fenix.utils
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.feature.sitepermissions.SitePermissionsRules
import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.ALLOWED
import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.ASK_TO_ALLOW
@ -17,15 +17,12 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.clearAndCommit
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class SettingsTest {
lateinit var settings: Settings

7
app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt
View File

@ -4,19 +4,16 @@
package org.mozilla.fenix.whatsnew
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.clearAndCommit
import org.mozilla.fenix.utils.Settings
import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class WhatsNewStorageTest {
private lateinit var storage: SharedPreferenceWhatsNewStorage
private lateinit var settings: Settings

7
app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt
View File

@ -4,19 +4,16 @@ package org.mozilla.fenix.whatsnew
* 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/. */
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.utils.Settings
import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class WhatsNewTest {
private lateinit var storage: SharedPreferenceWhatsNewStorage
private lateinit var settings: Settings

7
app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt
View File

@ -23,20 +23,17 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.fenix.HomeActivity.Companion.OPEN_TO_BROWSER_AND_LOAD
import org.mozilla.fenix.IntentReceiverActivity
import org.mozilla.fenix.TestApplication
import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.PREVIOUS_INTENT
import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING
import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_REQUEST_CODE
import org.robolectric.Robolectric
import org.robolectric.RobolectricTestRunner
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.robolectric.Shadows
import org.robolectric.android.controller.ActivityController
import org.robolectric.annotation.Config
import org.robolectric.shadows.ShadowActivity
@ExperimentalCoroutinesApi
@RunWith(RobolectricTestRunner::class)
@Config(application = TestApplication::class)
@RunWith(FenixRobolectricTestRunner::class)
class VoiceSearchActivityTest {
private lateinit var controller: ActivityController<VoiceSearchActivity>