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

Commit 37f8c719 authored by Jerry Chang's avatar Jerry Chang
Browse files

Skip running app pair flicker tests since it's deprecated 

Remove app-pair flicker tests from presubmit and mark them with @Ignore
since app-pair is not currently used but kept in codebase for backup.

Fix: 223076688
Fix: 226869067
Fix: 214190843
Fix: 200778092
Fix: 200777653
Test: atest WMShellFlickerTests
Change-Id: I328d87f87bf9c5f01d86474b850d7d3056aa3ed9
parent 8cc6ed54

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

+6 −7
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -31,6 +29,7 @@ import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.setSuppo 
import org.junit.After

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -76,23 +75,23 @@ class AppPairsTestCannotPairNonResizeableApps( 
        resetMultiWindowConfig(instrumentation)

    }



    @FlakyTest

    @Ignore

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Ignore

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @Presubmit

    @Ignore

    @Test

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()



    @Presubmit

    @Ignore

    @Test

    fun onlyResizeableAppWindowVisible() {

        val nonResizeableApp = nonResizeableApp

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

+7 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -29,6 +27,7 @@ import com.android.wm.shell.flicker.appPairsDividerIsVisibleAtEnd 
import com.android.wm.shell.flicker.helpers.AppPairsHelper

import com.android.wm.shell.flicker.helpers.AppPairsHelper.Companion.waitAppsShown

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -57,23 +56,23 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
            }

        }



    @Presubmit

    @Ignore

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @FlakyTest

    @Ignore

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Ignore

    @Test

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()



    @Presubmit

    @Ignore

    @Test

    fun bothAppWindowsVisible() {

        testSpec.assertWmEnd {
@@ -82,7 +81,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Ignore

    @Test

    fun appsEndingBounds() {

        testSpec.assertLayersEnd {

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

+6 −7
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Presubmit

import android.view.Display

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -33,6 +31,7 @@ import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.setSuppo 
import org.junit.After

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -89,23 +88,23 @@ class AppPairsTestSupportPairNonResizeableApps( 
        resetMultiWindowConfig(instrumentation)

    }



    @Presubmit

    @Ignore

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @FlakyTest

    @Ignore

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Ignore

    @Test

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()



    @Presubmit

    @Ignore

    @Test

    fun bothAppWindowVisible() {

        val nonResizeableApp = nonResizeableApp

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

+8 −9
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.wm.shell.flicker.apppairs



import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -30,6 +28,7 @@ import com.android.wm.shell.flicker.appPairsDividerIsInvisibleAtEnd 
import com.android.wm.shell.flicker.helpers.AppPairsHelper

import com.android.wm.shell.flicker.helpers.AppPairsHelper.Companion.waitAppsShown

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -65,19 +64,19 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
            }

        }



    @FlakyTest

    @Ignore

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Ignore

    @Test

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()



    @Presubmit

    @Ignore

    @Test

    fun bothAppWindowsInvisible() {

        testSpec.assertWmEnd {
@@ -86,7 +85,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Ignore

    @Test

    fun appsStartingBounds() {

        testSpec.assertLayersStart {
@@ -98,7 +97,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Ignore

    @Test

    fun appsEndingBounds() {

        testSpec.assertLayersEnd {
@@ -107,7 +106,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @Presubmit

    @Ignore

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

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

+7 −8
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ package com.android.wm.shell.flicker.apppairs 


import android.app.Instrumentation

import android.content.Context

import android.platform.test.annotations.Presubmit

import android.system.helpers.ActivityHelper

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -42,6 +40,7 @@ import com.android.wm.shell.flicker.helpers.SplitScreenHelper 
import com.android.wm.shell.flicker.testapp.Components

import org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Test



abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) {
@@ -145,35 +144,35 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) 
        append("$primaryApp $secondaryApp")

    }



    @FlakyTest(bugId = 186510496)

    @Ignore

    @Test

    open fun navBarLayerIsVisible() {

        testSpec.navBarLayerIsVisible()

    }



    @Presubmit

    @Ignore

    @Test

    open fun statusBarLayerIsVisible() {

        testSpec.statusBarLayerIsVisible()

    }



    @Presubmit

    @Ignore

    @Test

    open fun navBarWindowIsVisible() {

        testSpec.navBarWindowIsVisible()

    }



    @Presubmit

    @Ignore

    @Test

    open fun statusBarWindowIsVisible() {

        testSpec.statusBarWindowIsVisible()

    }



    @Presubmit

    @Ignore

    @Test

    open fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    @Presubmit

    @Ignore

    @Test

    open fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

}
 
 No newline at end of file