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

Commit b70cf57b authored by Nataniel Borges's avatar Nataniel Borges
Browse files

2/ Use TAPL for going home and recents in app close tests 

Previously we used UIAutomator directly which could cause instability

Also, fix ktlint formatting issues

Bug: 236131465
Test: atest FlickerTests
Change-Id: I685c6c50774135ea07b7a3be399cb397d96f3744
parent 42402af2

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        get() = {

        get() = {

            super.transition(this)

            super.transition(this)

            transitions {

            transitions {

                device.pressBack()

                tapl.pressBack()

                wmHelper.waitForHomeActivityVisible()

                wmHelper.waitForHomeActivityVisible()

            }

            }

        }

        }

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 




package com.android.server.wm.flicker.close

package com.android.server.wm.flicker.close





import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameter
@@ -69,7 +69,7 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
        get() = {

        get() = {

            super.transition(this)

            super.transition(this)

            transitions {

            transitions {

                device.pressHome()

                tapl.goHome()

                wmHelper.waitForHomeActivityVisible()

                wmHelper.waitForHomeActivityVisible()

            }

            }

        }

        }

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt

+4 −2
Original line number Original line Diff line number Diff line
@@ -19,21 +19,22 @@ package com.android.server.wm.flicker.close 
import android.app.Instrumentation

import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.LAUNCHER_COMPONENT

import com.android.server.wm.flicker.LAUNCHER_COMPONENT

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.entireScreenCovered

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsVisible

import com.android.server.wm.flicker.navBarLayerIsVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.replacesLayer

import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.flicker.replacesLayer

import org.junit.Test

import org.junit.Test





/**

/**
@@ -42,6 +43,7 @@ import org.junit.Test 
abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {

abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {

    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    protected open val testApp: StandardAppHelper = SimpleAppHelper(instrumentation)

    protected open val testApp: StandardAppHelper = SimpleAppHelper(instrumentation)

    protected val tapl = LauncherInstrumentation()





    /**

    /**

     * Specification of the test transition to execute

     * Specification of the test transition to execute