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

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

Add support to newer devices on flicker tests 

Some of the assertions used in flicker worked in older devices but not on newer ones.

Disable these assertions and make flicker tests compatible with notch to run on newer devices

Bug: 206753786
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Idf889506d767c4743938ee6727cd228b29873e66
parent 96709414

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class AppPairsTestCannotPairNonResizeableApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Presubmit

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Presubmit

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ class AppPairsTestSupportPairNonResizeableApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Presubmit

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Presubmit

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.apppairs 


import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -92,6 +93,10 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
        testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation,

            secondaryApp.component)



    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    companion object {

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

        @JvmStatic