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

Commit 97199b79 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes from topic "update-flicker-annotation" into udc-qpr-dev 

* changes:
  Add base test classes for SplitScreen scenario
  Update annotation package
parents 8c3f7dfc c1743e65

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

0 → 100644
+67 −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.splitscreen.scenarios



import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

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 org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class CopyContentInSplit

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)

    private val textEditApp = SplitScreenUtils.getIme(instrumentation)



    @Rule

    @JvmField

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



    @Before

    fun setup() {

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, textEditApp)

    }



    @Test

    open fun copyContentInSplit() {

        SplitScreenUtils.copyContentInSplit(instrumentation, device, primaryApp, textEditApp)

    }



    @After

    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }

}

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

0 → 100644
+80 −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.splitscreen.scenarios



import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

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 org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class DismissSplitScreenByDivider

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

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



    @Before

    fun setup() {

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

    }



    @Test

    open fun dismissSplitScreenByDivider() {

        if (tapl.isTablet) {

            SplitScreenUtils.dragDividerToDismissSplit(

                device,

                wmHelper,

                dragToRight = false,

                dragToBottom = true

            )

        } else {

            SplitScreenUtils.dragDividerToDismissSplit(

                device,

                wmHelper,

                dragToRight = true,

                dragToBottom = true

            )

        }

        wmHelper.StateSyncBuilder().withFullScreenApp(secondaryApp).waitForAndVerify()

    }



    @After

    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }

}

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

0 → 100644
+66 −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.splitscreen.scenarios



import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

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 org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class DismissSplitScreenByGoHome

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

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



    @Before

    fun setup() {

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

    }



    @Test

    open fun dismissSplitScreenByGoHome() {

        tapl.goHome()

        wmHelper.StateSyncBuilder().withHomeActivityVisible().waitForAndVerify()

    }



    @After

    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }

}

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

0 → 100644
+65 −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.splitscreen.scenarios



import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

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 org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class DragDividerToResize

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

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



    @Before

    fun setup() {

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

    }



    @Test

    open fun dragDividerToResize() {

        SplitScreenUtils.dragDividerToResizeAndWait(device, wmHelper)

    }



    @After

    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }

}

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

0 → 100644
+70 −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.splitscreen.scenarios



import android.app.Instrumentation

import android.tools.common.NavBar

import android.tools.common.Rotation

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 org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class EnterSplitScreenByDragFromAllApps

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val primaryApp = SplitScreenUtils.getPrimary(instrumentation)

    private val secondaryApp = SplitScreenUtils.getSecondary(instrumentation)



    @Rule

    @JvmField

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



    @Before

    fun setup() {

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        tapl.goHome()

        primaryApp.launchViaIntent(wmHelper)

    }



    @Test

    open fun enterSplitScreenByDragFromAllApps() {

        tapl.launchedAppState.taskbar

            .openAllApps()

            .getAppIcon(secondaryApp.appName)

            .dragToSplitscreen(secondaryApp.`package`, primaryApp.`package`)

        SplitScreenUtils.waitForSplitComplete(wmHelper, primaryApp, secondaryApp)

    }



    @After

    fun teardown() {

        primaryApp.exit(wmHelper)

        secondaryApp.exit(wmHelper)

    }

}