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

Commit 5379b671 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update testSetupRule to take the navigation mode and rotation values directly instead of a function 

Bug: 289349543
Test: atest WMShellFlickerServiceTests
Change-Id: Ib8e7bc4178982e3e3823a5ee9d45faef8ceb4615
parent 841846ee

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt

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

 * Copyright (C) 2023 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.wm.shell.flicker.service



import android.app.Instrumentation

import android.platform.test.rule.NavigationModeRule

import android.platform.test.rule.PressHomeRule

import android.platform.test.rule.UnlockScreenRule

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.device.apphelpers.MessagingAppHelper

import android.tools.device.flicker.rules.ChangeDisplayOrientationRule

import android.tools.device.flicker.rules.LaunchAppRule

import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule

import androidx.test.platform.app.InstrumentationRegistry

import org.junit.rules.RuleChain



object Utils {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()



    fun testSetupRule(navigationMode: NavBar, rotation: Rotation): RuleChain {

        return RuleChain.outerRule(UnlockScreenRule())

            .around(

                NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)

            )

            .around(

                LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)

            )

            .around(RemoveAllTasksButHomeRule())

            .around(

                ChangeDisplayOrientationRule(

                    rotation,

                    resetOrientationAfterTest = false,

                    clearCacheAfterParsing = false

                )

            )

            .around(PressHomeRule())

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/CopyContentInSplit.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import org.junit.After

import org.junit.Before

import org.junit.Ignore
@@ -42,9 +43,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)

    private val textEditApp = SplitScreenUtils.getIme(instrumentation)



    @Rule

    @JvmField

    val testSetupRule = SplitScreenUtils.testSetupRule({ NavBar.MODE_GESTURAL }, { rotation })

    @Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)



    @Before

    fun setup() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByDivider.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import org.junit.After

import org.junit.Before

import org.junit.Ignore
@@ -40,9 +41,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

    val testSetupRule = SplitScreenUtils.testSetupRule({ NavBar.MODE_GESTURAL }, { rotation })

    @Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)



    @Before

    fun setup() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByGoHome.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import org.junit.After

import org.junit.Before

import org.junit.Ignore
@@ -40,9 +41,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

    val testSetupRule = SplitScreenUtils.testSetupRule({ NavBar.MODE_GESTURAL }, { rotation })

    @Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)



    @Before

    fun setup() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DragDividerToResize.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.tools.device.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.wm.shell.flicker.service.Utils

import org.junit.After

import org.junit.Before

import org.junit.Ignore
@@ -40,9 +41,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

    val testSetupRule = SplitScreenUtils.testSetupRule({ NavBar.MODE_GESTURAL }, { rotation })

    @Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)



    @Before

    fun setup() {