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

Commit 06b0a479 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Skip running app pair flicker tests since it's deprecated" into... 

Merge "Merge "Skip running app pair flicker tests since it's deprecated" into tm-dev am: 535fbd5b am: 4bfa1e6a" into tm-d1-dev-plus-aosp am: 4af27eb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17990062



Change-Id: I77a0fab3e3424c8d7f9775c13b66a83d203b9d6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e47af4e 4af27eb2

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