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

Commit a66a05ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Include AE Flicker tests to be tracked" into udc-qpr-dev

parents 59e9f7fe 1fc8dbf3

tests/FlickerTests/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -39,7 +39,11 @@ filegroup { 
        "src/**/activityembedding/*.kt",

        "src/**/activityembedding/open/*.kt",

        "src/**/activityembedding/close/*.kt",

        "src/**/activityembedding/layoutchange/*.kt",

        "src/**/activityembedding/pip/*.kt",

        "src/**/activityembedding/rotation/*.kt",

        "src/**/activityembedding/rtl/*.kt",

        "src/**/activityembedding/splitscreen/*.kt",

    ],

}

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/close/CloseSecondaryActivityInSplitTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.junit.runners.Parameterized 
 * Setup: Launch A|B in split with B being the secondary activity. Transitions: Finish B and expect

 * A to become fullscreen.

 *

 * To run this test: `atest FlickerTests:CloseSecondaryActivityInSplitTest`

 * To run this test: `atest FlickerTestsOther:CloseSecondaryActivityInSplitTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.wm.flicker.activityembedding

package com.android.server.wm.flicker.activityembedding.layoutchange



import android.platform.test.annotations.Presubmit

import android.tools.common.datatypes.Rect
@@ -22,6 +22,7 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory 
import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase

import com.android.server.wm.flicker.helpers.ActivityEmbeddingAppHelper

import androidx.test.filters.RequiresDevice

import org.junit.FixMethodOrder
@@ -38,7 +39,7 @@ import org.junit.runners.Parameterized 
 * Transitions:

 * Change the split ratio to A:B=0.7:0.3, expect bounds change for both A and B.

 *

 * To run this test: `atest FlickerTests:HorizontalSplitChangeRatioTest`

 * To run this test: `atest FlickerTestsOther:HorizontalSplitChangeRatioTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/MainActivityStartsSecondaryWithAlwaysExpandTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.junit.runners.Parameterized 
 * Setup: Launch A|B in split with B being the secondary activity. Transitions: A start C with

 * alwaysExpand=true, expect C to launch in fullscreen and cover split A|B.

 *

 * To run this test: `atest FlickerTests:MainActivityStartsSecondaryWithAlwaysExpandTest`

 * To run this test: `atest FlickerTestsOther:MainActivityStartsSecondaryWithAlwaysExpandTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/open/OpenActivityEmbeddingPlaceholderSplitTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import org.junit.runners.Parameterized 
 * Test opening an activity that will launch another activity as ActivityEmbedding placeholder in

 * split.

 *

 * To run this test: `atest FlickerTests:OpenActivityEmbeddingPlaceholderSplitTest`

 * To run this test: `atest FlickerTestsOther:OpenActivityEmbeddingPlaceholderSplitTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)