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

Commit 007709c3 authored by Ioana Moraru's avatar Ioana Moraru Committed by Android (Google) Code Review
Browse files

Merge "Add assertions for two activities transition"

parents f8918279 fbab19d7

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/TwoActivitiesAppHelper.kt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.helpers



import android.app.Instrumentation

import android.content.ComponentName

import android.support.test.launcherhelper.ILauncherStrategy

import android.support.test.launcherhelper.LauncherStrategyFactory

import androidx.test.uiautomator.By

import androidx.test.uiautomator.UiDevice

import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.testapp.ActivityOptions

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper



class TwoActivitiesAppHelper @JvmOverloads constructor(

    instr: Instrumentation,

    launcherName: String = ActivityOptions.BUTTON_ACTIVITY_LAUNCHER_NAME,

    component: ComponentName = ActivityOptions.BUTTON_ACTIVITY_COMPONENT_NAME,

    launcherStrategy: ILauncherStrategy = LauncherStrategyFactory

        .getInstance(instr)

        .launcherStrategy

) : StandardAppHelper(instr, launcherName, component, launcherStrategy) {

    fun openSecondActivity(device: UiDevice, wmHelper: WindowManagerStateHelper) {

        val button = device.wait(

                Until.findObject(By.res(getPackage(), "launch_second_activity")),

                FIND_TIMEOUT)



        require(button != null) {

            "Button not found, this usually happens when the device " +

                    "was left in an unknown state (e.g. in split screen)"

        }

        button.click()

        wmHelper.waitForAppTransitionIdle()

        wmHelper.waitForFullScreenApp(component)

    }

}
 
 No newline at end of file

tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt

0 → 100644
+119 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.launch



import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

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

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

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

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.annotation.Group1

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

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

import com.android.server.wm.flicker.testapp.ActivityOptions

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test the back and forward transition between 2 activities.

 * To run this test: `atest FlickerTests:ActivitiesTransitionTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

class ActivitiesTransitionTest(val testSpec: FlickerTestParameter) {

    val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val testApp: TwoActivitiesAppHelper = TwoActivitiesAppHelper(instrumentation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

                eachRun {

                    testApp.launchViaIntent(wmHelper)

                    wmHelper.waitForFullScreenApp(testApp.component)

                }

            }

            teardown {

                test {

                    testApp.exit()

                }

            }

            transitions {

                testApp.openSecondActivity(device, wmHelper)

                device.pressBack()

                wmHelper.waitForAppTransitionIdle()

                wmHelper.waitForFullScreenApp(testApp.component)

            }

        }

    }



    @Postsubmit

    @Test

    fun finishSubActivity() {

        testSpec.assertWm {

            this.isAppWindowOnTop(ActivityOptions.BUTTON_ACTIVITY_COMPONENT_NAME)

                    .then()

                    .isAppWindowOnTop(ActivityOptions.SIMPLE_ACTIVITY_AUTO_FOCUS_COMPONENT_NAME)

                    .then()

                    .isAppWindowOnTop(ActivityOptions.BUTTON_ACTIVITY_COMPONENT_NAME)

        }

    }



    @Postsubmit

    @Test

    fun entireScreenCovered() {

        testSpec.entireScreenCovered(testSpec.config.startRotation)

    }



    @Postsubmit

    @Test

    fun launcherWindowNotVisible() {

        testSpec.assertWm {

            this.isAppWindowInvisible(LAUNCHER_COMPONENT, ignoreActivity = true)

        }

    }



    @Postsubmit

    @Test

    fun launcherLayerNotVisible() {

        testSpec.assertLayers { this.isInvisible(LAUNCHER_COMPONENT) }

    }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

                    .getConfigNonRotationTests(repetitions = 5)

        }

    }

}

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -70,5 +70,15 @@ 
                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".ButtonActivity"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ButtonActivity"

            android:configChanges="orientation|screenSize"

            android:label="ButtonActivity"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

    </application>

</manifest>

tests/FlickerTests/test-apps/flickerapp/res/layout/activity_button.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright 2018 The Android Open Source Project



 Licensed under the Apache License, Version 2.0 (the "License");

 you may not use this file except in compliance with the License.

 You may obtain a copy of the License at



     http://www.apache.org/licenses/LICENSE-2.0



 Unless required by applicable law or agreed to in writing, software

 distributed under the License is distributed on an "AS IS" BASIS,

 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 See the License for the specific language governing permissions and

 limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/holo_orange_light">

    <Button

        android:id="@+id/launch_second_activity"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="Second activity" />

</LinearLayout>

tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java

+5 −0
Original line number Diff line number Diff line
@@ -46,4 +46,9 @@ public class ActivityOptions { 
    public static final ComponentName NON_RESIZEABLE_ACTIVITY_COMPONENT_NAME =

            new ComponentName(FLICKER_APP_PACKAGE,

                    FLICKER_APP_PACKAGE + ".NonResizeableActivity");



    public static final String BUTTON_ACTIVITY_LAUNCHER_NAME = "ButtonApp";

    public static final ComponentName BUTTON_ACTIVITY_COMPONENT_NAME =

            new ComponentName(FLICKER_APP_PACKAGE,

                    FLICKER_APP_PACKAGE + ".ButtonActivity");

}