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

Commit d09f0521 authored by An An Yu's avatar An An Yu Committed by Automerger Merge Worker
Browse files

Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest... 

Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest flaky" into udc-qpr-dev am: a2239704 am: 64463f92

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



Change-Id: I62059d00da0cf35b3dc078e9d39fb3b1908a0a52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4588d28d 64463f92

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

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


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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.common.datatypes.Rect

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -65,6 +66,21 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest 
        }

    }



    @FlakyTest(bugId = 286952194)

    @Presubmit

    @Test

    override fun navBarWindowIsVisibleAtStartAndEnd() {}



    @FlakyTest(bugId = 286952194)

    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() {}



    @FlakyTest(bugId = 286952194)

    @Presubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() {}



    /** Transition begins with a split. */

    @Presubmit

    @Test
@@ -110,6 +126,7 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest 
    }



    /** Always expand activity is on top of the split. */

    @FlakyTest(bugId = 286952194)

    @Presubmit

    @Test

    fun endsWithAlwaysExpandActivityOnTop() {