Merge "Promote passing OpenAppFromLockNotificationCold tests" into udc-dev

This commit is contained in:
Treehugger Robot
2023-04-14 15:43:54 +00:00
committed by Android (Google) Code Review

View File

@@ -16,12 +16,9 @@
package com.android.server.wm.flicker.launch
import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.platform.test.rule.SettingOverrideRule
import android.provider.Settings
import android.tools.common.datatypes.component.ComponentNameMatcher
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
import android.tools.device.flicker.legacy.FlickerBuilder
import android.tools.device.flicker.legacy.FlickerTest
@@ -67,12 +64,6 @@ open class OpenAppFromLockNotificationCold(flicker: FlickerTest) :
}
}
/** {@inheritDoc} */
@FlakyTest(bugId = 203538234)
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
/** {@inheritDoc} */
@Test @Ignore("Display is off at the start") override fun navBarLayerPositionAtStartAndEnd() {}
@@ -97,14 +88,6 @@ open class OpenAppFromLockNotificationCold(flicker: FlickerTest) :
@Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")
override fun navBarWindowIsVisibleAtStartAndEnd() = super.navBarWindowIsVisibleAtStartAndEnd()
/**
* Checks the position of the [ComponentNameMatcher.STATUS_BAR] at the start and end of the
* transition
*/
@Presubmit
@Test
override fun statusBarLayerPositionAtEnd() = super.statusBarLayerPositionAtEnd()
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")
@@ -143,7 +126,7 @@ open class OpenAppFromLockNotificationCold(flicker: FlickerTest) :
val disableUnseenNotifFilterRule =
SettingOverrideRule(
Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
/* value= */ "0",
/* value = */ "0",
)
}
}