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

Commit 535fbd5b authored by Jerry Chang's avatar Jerry Chang Committed by Android (Google) Code Review
Browse files

Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev

parents 300f68de 37f8c719

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

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




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

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





import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

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

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

import org.junit.Before

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

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

        resetMultiWindowConfig(instrumentation)

    }

    }





    @FlakyTest

    @Ignore

    @Test

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()





    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()





    @Presubmit

    @Ignore

    @Test

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun onlyResizeableAppWindowVisible() {

    fun onlyResizeableAppWindowVisible() {

        val nonResizeableApp = nonResizeableApp

        val nonResizeableApp = nonResizeableApp

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

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




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

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





import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

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

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

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

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

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

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

            }

        }

        }





    @Presubmit

    @Ignore

    @Test

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()





    @FlakyTest

    @Ignore

    @Test

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()





    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun bothAppWindowsVisible() {

    fun bothAppWindowsVisible() {

        testSpec.assertWmEnd {

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

        }

    }

    }





    @FlakyTest

    @Ignore

    @Test

    @Test

    fun appsEndingBounds() {

    fun appsEndingBounds() {

        testSpec.assertLayersEnd {

        testSpec.assertLayersEnd {

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

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




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

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





import android.platform.test.annotations.Presubmit

import android.view.Display

import android.view.Display

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

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

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

import org.junit.Before

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

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

        resetMultiWindowConfig(instrumentation)

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()





    @FlakyTest

    @Ignore

    @Test

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()





    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()

    fun appPairsDividerIsVisibleAtEnd() = testSpec.appPairsDividerIsVisibleAtEnd()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun bothAppWindowVisible() {

    fun bothAppWindowVisible() {

        val nonResizeableApp = nonResizeableApp

        val nonResizeableApp = nonResizeableApp

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

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

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





import android.os.SystemClock

import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

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

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

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

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

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

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

            }

        }

        }





    @FlakyTest

    @Ignore

    @Test

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()





    @FlakyTest(bugId = 206753786)

    @Ignore

    @Test

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()

    fun appPairsDividerIsInvisibleAtEnd() = testSpec.appPairsDividerIsInvisibleAtEnd()





    @Presubmit

    @Ignore

    @Test

    @Test

    fun bothAppWindowsInvisible() {

    fun bothAppWindowsInvisible() {

        testSpec.assertWmEnd {

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

        }

    }

    }





    @FlakyTest

    @Ignore

    @Test

    @Test

    fun appsStartingBounds() {

    fun appsStartingBounds() {

        testSpec.assertLayersStart {

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

        }

    }

    }





    @FlakyTest

    @Ignore

    @Test

    @Test

    fun appsEndingBounds() {

    fun appsEndingBounds() {

        testSpec.assertLayersEnd {

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

        }

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()

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

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




import android.app.Instrumentation

import android.app.Instrumentation

import android.content.Context

import android.content.Context

import android.platform.test.annotations.Presubmit

import android.system.helpers.ActivityHelper

import android.system.helpers.ActivityHelper

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

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

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

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

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 com.android.wm.shell.flicker.testapp.Components

import org.junit.After

import org.junit.After

import org.junit.Before

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.Test





abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) {

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

        append("$primaryApp $secondaryApp")

    }

    }





    @FlakyTest(bugId = 186510496)

    @Ignore

    @Test

    @Test

    open fun navBarLayerIsVisible() {

    open fun navBarLayerIsVisible() {

        testSpec.navBarLayerIsVisible()

        testSpec.navBarLayerIsVisible()

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    open fun statusBarLayerIsVisible() {

    open fun statusBarLayerIsVisible() {

        testSpec.statusBarLayerIsVisible()

        testSpec.statusBarLayerIsVisible()

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    open fun navBarWindowIsVisible() {

    open fun navBarWindowIsVisible() {

        testSpec.navBarWindowIsVisible()

        testSpec.navBarWindowIsVisible()

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    open fun statusBarWindowIsVisible() {

    open fun statusBarWindowIsVisible() {

        testSpec.statusBarWindowIsVisible()

        testSpec.statusBarWindowIsVisible()

    }

    }





    @Presubmit

    @Ignore

    @Test

    @Test

    open fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()

    open fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()





    @Presubmit

    @Ignore

    @Test

    @Test

    open fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    open fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

}
 
}
 
 No newline at end of file