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

Commit f9c4ee1f authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Move legacy split screen flicker tests for non-resizable to presubmit" into sc-dev

parents 34eedf49 2e020366

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNotSupportNonResizable.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.legacysplitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -44,7 +44,6 @@ import org.junit.runners.Parameterized 
 *

 * To run this test: `atest WMShellFlickerTests:EnterSplitScreenNotSupportNonResizable`

 */

@Postsubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -94,6 +93,7 @@ class EnterSplitScreenNotSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @Presubmit

    @Test

    fun dockedStackDividerIsInvisible() = testSpec.dockedStackDividerIsInvisible()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenSupportNonResizable.kt

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.legacysplitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -43,7 +43,6 @@ import org.junit.runners.Parameterized 
 *

 * To run this test: `atest WMShellFlickerTests:EnterSplitScreenSupportNonResizable`

 */

@Postsubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -91,9 +90,11 @@ class EnterSplitScreenSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @Presubmit

    @Test

    fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()



    @Presubmit

    @Test

    fun appWindowIsVisible() {

        testSpec.assertWmEnd {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromIntentNotSupportNonResizable.kt

+7 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.legacysplitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -46,7 +46,6 @@ import org.junit.runners.Parameterized 
 * support non-resizable in multi window, it should trigger exit split screen.

 * To run this test: `atest WMShellFlickerTests:LegacySplitScreenFromIntentNotSupportNonResizable`

 */

@Postsubmit

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@@ -95,25 +94,31 @@ class LegacySplitScreenFromIntentNotSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @Presubmit

    @Test

    fun resizableAppLayerBecomesInvisible() =

            testSpec.layerBecomesInvisible(splitScreenApp.defaultWindowName)



    @Presubmit

    @Test

    fun nonResizableAppLayerBecomesVisible() =

            testSpec.layerBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun resizableAppWindowBecomesInvisible() =

            testSpec.appWindowBecomesInVisible(splitScreenApp.defaultWindowName)



    @Presubmit

    @Test

    fun nonResizableAppWindowBecomesVisible() =

            testSpec.appWindowBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun dockedStackDividerIsInvisibleAtEnd() = testSpec.dockedStackDividerIsInvisible()



    @Presubmit

    @Test

    fun onlyNonResizableAppWindowIsVisibleAtEnd() {

        testSpec.assertWmEnd {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromIntentSupportNonResizable.kt

+5 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.legacysplitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -44,7 +44,6 @@ import org.junit.runners.Parameterized 
 * non-resizable in multi window, it should show the non-resizable app in split screen.

 * To run this test: `atest WMShellFlickerTests:LegacySplitScreenFromIntentSupportNonResizable`

 */

@Postsubmit

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@@ -93,17 +92,21 @@ class LegacySplitScreenFromIntentSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @Presubmit

    @Test

    fun nonResizableAppLayerBecomesVisible() =

            testSpec.layerBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun nonResizableAppWindowBecomesVisible() =

            testSpec.appWindowBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun dockedStackDividerIsVisibleAtEnd() = testSpec.dockedStackDividerIsVisible()



    @Presubmit

    @Test

    fun bothAppsWindowsAreVisibleAtEnd() {

        testSpec.assertWmEnd {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromRecentNotSupportNonResizable.kt

+7 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.legacysplitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -47,7 +47,6 @@ import org.junit.runners.Parameterized 
 * not support non-resizable in multi window, it should trigger exit split screen.

 * To run this test: `atest WMShellFlickerTests:LegacySplitScreenFromRecentNotSupportNonResizable`

 */

@Postsubmit

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@@ -96,25 +95,31 @@ class LegacySplitScreenFromRecentNotSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @Presubmit

    @Test

    fun resizableAppLayerBecomesInvisible() =

            testSpec.layerBecomesInvisible(splitScreenApp.defaultWindowName)



    @Presubmit

    @Test

    fun nonResizableAppLayerBecomesVisible() =

            testSpec.layerBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun resizableAppWindowBecomesInvisible() =

        testSpec.appWindowBecomesInVisible(splitScreenApp.defaultWindowName)



    @Presubmit

    @Test

    fun nonResizableAppWindowBecomesVisible() =

        testSpec.appWindowBecomesVisible(nonResizeableApp.defaultWindowName)



    @Presubmit

    @Test

    fun dockedStackDividerIsInvisibleAtEnd() = testSpec.dockedStackDividerIsInvisible()



    @Presubmit

    @Test

    fun onlyNonResizableAppWindowIsVisibleAtEnd() {

        testSpec.assertWmEnd {