Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 596b9f1c authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Disable assertion check for SimpleActivity and fix linter" into main

parents 93fc0868 217c8cb4

tests/FlickerTests/IME/src/com/android/server/wm/flicker/ime/CloseImeToHomeOnFinishActivityTest.kt

+13 −6
Original line number Original line Diff line number Diff line
@@ -19,12 +19,12 @@ package com.android.server.wm.flicker.ime 
import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.tools.common.Rotation

import android.tools.common.Rotation

import android.tools.common.flicker.subject.layers.LayersTraceSubject.Companion.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.device.traces.parsers.toFlickerComponent

import android.tools.device.traces.parsers.toFlickerComponent

import androidx.test.filters.FlakyTest

import com.android.server.wm.flicker.BaseTest

import com.android.server.wm.flicker.BaseTest

import com.android.server.wm.flicker.helpers.ImeAppHelper

import com.android.server.wm.flicker.helpers.ImeAppHelper

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.server.wm.flicker.helpers.SimpleAppHelper
@@ -58,7 +58,8 @@ class CloseImeToHomeOnFinishActivityTest(flicker: LegacyFlickerTest) : BaseTest( 
        }

        }

        transitions {

        transitions {

            broadcastActionTrigger.doAction(ACTION_FINISH_ACTIVITY)

            broadcastActionTrigger.doAction(ACTION_FINISH_ACTIVITY)

            wmHelper.StateSyncBuilder()

            wmHelper

                .StateSyncBuilder()

                .withActivityRemoved(ActivityOptions.Ime.Default.COMPONENT.toFlickerComponent())

                .withActivityRemoved(ActivityOptions.Ime.Default.COMPONENT.toFlickerComponent())

                .waitForAndVerify()

                .waitForAndVerify()

        }

        }
@@ -69,10 +70,16 @@ class CloseImeToHomeOnFinishActivityTest(flicker: LegacyFlickerTest) : BaseTest( 




    @Presubmit @Test fun imeLayerBecomesInvisible() = flicker.imeLayerBecomesInvisible()

    @Presubmit @Test fun imeLayerBecomesInvisible() = flicker.imeLayerBecomesInvisible()





    @FlakyTest(bugId = 246284124)

    @Presubmit

    @Test

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        flicker.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS.toMutableList().also {

                    it.add(simpleApp.componentMatcher)

                }

            )

        }

    }

    }





    @Presubmit

    @Presubmit