Commit f720e944 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by brizental
Browse files

fixup! [android] Delete unused media 

More occurrences of our placeholder icon.
parent b68fe2d5

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt

+13 −12
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ package org.mozilla.fenix.onboarding.view 


import io.mockk.every

import io.mockk.mockk

import mozilla.components.lib.crash.R as crashR

import mozilla.components.service.nimbus.evalJexlSafe

import org.junit.Assert.assertEquals

import org.junit.Before
@@ -580,7 +581,7 @@ val privacyCaption: Caption = mockk(relaxed = true) 


private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "default browser title",

    description = "default browser body",

    primaryButtonLabel = "default browser primary button text",
@@ -589,7 +590,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData( 
)

private val addSearchWidgetPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "add search widget title",

    description = "add search widget body",

    primaryButtonLabel = "add search widget primary button text",
@@ -598,7 +599,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData( 
)

private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "add search widget title",

    description = "add search widget body",

    primaryButtonLabel = "add search widget primary button text",
@@ -607,7 +608,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData( 
)

private val syncPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "sync title",

    description = "sync body",

    primaryButtonLabel = "sync primary button text",
@@ -616,7 +617,7 @@ private val syncPageUiData = OnboardingPageUiData( 
)

private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "sync title",

    description = "sync body",

    primaryButtonLabel = "sync primary button text",
@@ -641,7 +642,7 @@ private val toolbarPageUiData = OnboardingPageUiData( 
)

private val notificationPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "notification title",

    description = "notification body",

    primaryButtonLabel = "notification primary button text",
@@ -651,7 +652,7 @@ private val notificationPageUiData = OnboardingPageUiData( 


private val defaultBrowserCardData = OnboardingCardData(

    cardType = OnboardingCardType.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "default browser title"),

    body = StringHolder(null, "default browser body"),

    primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -663,7 +664,7 @@ private val defaultBrowserCardData = OnboardingCardData( 


private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(

    cardType = OnboardingCardType.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "default browser title"),

    body = StringHolder(null, "default browser body"),

    primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -675,7 +676,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData( 


private val addSearchWidgetCardDataNoConditions = OnboardingCardData(

    cardType = OnboardingCardType.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "add search widget title"),

    body = StringHolder(null, "add search widget body"),

    primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -687,7 +688,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData( 


private val addSearchWidgetCardData = OnboardingCardData(

    cardType = OnboardingCardType.ADD_SEARCH_WIDGET,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "add search widget title"),

    body = StringHolder(null, "add search widget body"),

    primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -697,7 +698,7 @@ private val addSearchWidgetCardData = OnboardingCardData( 


private val syncCardData = OnboardingCardData(

    cardType = OnboardingCardType.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "sync title"),

    body = StringHolder(null, "sync body"),

    primaryButtonLabel = StringHolder(null, "sync primary button text"),
@@ -709,7 +710,7 @@ private val syncCardData = OnboardingCardData( 


private val notificationCardData = OnboardingCardData(

    cardType = OnboardingCardType.NOTIFICATION_PERMISSION,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = StringHolder(null, "notification title"),

    body = StringHolder(null, "notification body"),

    primaryButtonLabel = StringHolder(null, "notification primary button text"),

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt

+9 −8
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


package org.mozilla.fenix.onboarding.view



import mozilla.components.lib.crash.R as crashR

import org.junit.Assert.assertEquals

import org.junit.Test

import org.mozilla.fenix.R
@@ -13,7 +14,7 @@ class OnboardingMapperTest { 
    @Test

    fun `GIVEN a default browser page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {

        val expected = OnboardingPageState(

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "default browser title",

            description = "default browser body with link text",

            primaryButton = Action("default browser primary button text", unitLambda),
@@ -22,7 +23,7 @@ class OnboardingMapperTest { 


        val onboardingPageUiData = OnboardingPageUiData(

            type = OnboardingPageUiData.Type.DEFAULT_BROWSER,

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "default browser title",

            description = "default browser body with link text",

            primaryButtonLabel = "default browser primary button text",
@@ -50,7 +51,7 @@ class OnboardingMapperTest { 
    @Test

    fun `GIVEN a sync page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {

        val expected = OnboardingPageState(

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "sync title",

            description = "sync body",

            primaryButton = Action("sync primary button text", unitLambda),
@@ -59,7 +60,7 @@ class OnboardingMapperTest { 


        val onboardingPageUiData = OnboardingPageUiData(

            type = OnboardingPageUiData.Type.SYNC_SIGN_IN,

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "sync title",

            description = "sync body",

            primaryButtonLabel = "sync primary button text",
@@ -87,7 +88,7 @@ class OnboardingMapperTest { 
    @Test

    fun `GIVEN a notification page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {

        val expected = OnboardingPageState(

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "notification title",

            description = "notification body",

            primaryButton = Action("notification primary button text", unitLambda),
@@ -96,7 +97,7 @@ class OnboardingMapperTest { 


        val onboardingPageUiData = OnboardingPageUiData(

            type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "notification title",

            description = "notification body",

            primaryButtonLabel = "notification primary button text",
@@ -124,7 +125,7 @@ class OnboardingMapperTest { 
    @Test

    fun `GIVEN an add search widget page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() {

        val expected = OnboardingPageState(

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "add search widget title",

            description = "add search widget body with link text",

            primaryButton = Action("add search widget primary button text", unitLambda),
@@ -133,7 +134,7 @@ class OnboardingMapperTest { 


        val onboardingPageUiData = OnboardingPageUiData(

            type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,

            imageRes = R.drawable.mozac_lib_crash_notification,

            imageRes = crashR.drawable.mozac_lib_crash_notification,

            title = "add search widget title",

            description = "add search widget body with link text",

            primaryButtonLabel = "add search widget primary button text",

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiDataTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


package org.mozilla.fenix.onboarding.view



import mozilla.components.lib.crash.R as crashR

import org.junit.Assert.assertEquals

import org.junit.Test

import org.mozilla.fenix.R
@@ -53,7 +54,7 @@ class OnboardingPageUiDataTest { 


val defaultBrowserPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.DEFAULT_BROWSER,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "default browser title",

    description = "default browser body with link text",

    primaryButtonLabel = "default browser primary button text",
@@ -63,7 +64,7 @@ val defaultBrowserPageUiData = OnboardingPageUiData( 


val syncPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.SYNC_SIGN_IN,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "sync title",

    description = "sync body",

    primaryButtonLabel = "sync primary button text",
@@ -73,7 +74,7 @@ val syncPageUiData = OnboardingPageUiData( 


val notificationPageUiData = OnboardingPageUiData(

    type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,

    imageRes = R.drawable.mozac_lib_crash_notification,

    imageRes = crashR.drawable.mozac_lib_crash_notification,

    title = "notification title",

    description = "notification body",

    primaryButtonLabel = "notification primary button text",