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

Commit 098ac1d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Split flaky app close assertion until the bug is fixed." into...

Merge "Split flaky app close assertion until the bug is fixed." into udc-qpr-dev am: 0b9d4413 am: 4e9ef6ce

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



Change-Id: Ie4db08698dca36f0edee618013434b57e8c2b8b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d307ab0c 4e9ef6ce
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@

package com.android.server.wm.flicker.close

import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Presubmit
import android.tools.common.flicker.subject.layers.LayersTraceSubject.Companion.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS
import android.tools.common.traces.component.ComponentNameMatcher
import android.tools.common.traces.component.ComponentNameMatcher.Companion.LAUNCHER
import android.tools.device.apphelpers.StandardAppHelper
import android.tools.device.flicker.legacy.FlickerBuilder
@@ -71,4 +74,21 @@ abstract class CloseAppTransition(flicker: LegacyFlickerTest) : BaseTest(flicker
            ignoreEntriesWithRotationLayer = flicker.scenario.isLandscapeOrSeascapeAtStart
        )
    }

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
        flicker.assertLayers {
            this.visibleLayersShownMoreThanOneConsecutiveEntry(
                VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf(ComponentNameMatcher.NAV_BAR)
            )
        }
    }

    @FlakyTest(bugId = 288369951)
    @Test
    fun visibleLayersShownMoreThanOneConsecutiveEntryWithNavBar() {
        flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry() }
    }
}