Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant tests

Browse Source 
Since added OpenAppFromOverviewTest_ShellTransit any tests in OpenAppFromOverviewTest that are split between shell and non shell become redundant

Test: atest FlickerTests:OpenAppFromOverviewTest FlickerTests:OpenAppFromOverviewTest_ShellTransit

Change-Id: Ic4a53d969d2d62457c3d98d98090af0b942d03c8
This commit is contained in:
Pablo Gamito
2022-02-16 17:14:01 +01:00
parent b48721f9fc
commit 398d3e6d03
2 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt
View File

@@ -16,10 +16,10 @@
package com.android.server.wm.flicker.launch
import androidx.test.filters.FlakyTest
import android.platform.test.annotations.Presubmit
import android.platform.test.annotations.RequiresDevice
import android.view.Display
import androidx.test.filters.FlakyTest
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
@@ -31,7 +31,6 @@ import com.android.server.wm.flicker.helpers.reopenAppFromOverview
import com.android.server.wm.flicker.helpers.setRotation
import com.android.server.wm.traces.common.WindowManagerConditionsFactory
import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.FixMethodOrder
import org.junit.Test
@@ -140,37 +139,6 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter)
@Test
override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart()
/** {@inheritDoc} */
@Presubmit
@Test
override fun appWindowReplacesLauncherAsTopWindow() {
assumeFalse(isShellTransitionsEnabled)
super.appWindowReplacesLauncherAsTopWindow()
}
@FlakyTest(bugId = 216266712)
@Test
fun appWindowReplacesLauncherAsTopWindow_shellTransit() {
assumeTrue(isShellTransitionsEnabled)
super.appWindowReplacesLauncherAsTopWindow()
}
/** {@inheritDoc} */
@Presubmit
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
assumeFalse(isShellTransitionsEnabled)
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
}
/** {@inheritDoc} */
@FlakyTest(bugId = 218470989)
@Test
fun visibleWindowsShownMoreThanOneConsecutiveEntry_shellTransit() {
assumeTrue(isShellTransitionsEnabled)
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
}
companion object {
/**
* Creates the test configurations.

15
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest_ShellTransit.kt
View File

@@ -16,7 +16,7 @@
package com.android.server.wm.flicker.launch
import android.platform.test.annotations.FlakyTest
import androidx.test.filters.FlakyTest
import android.platform.test.annotations.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
@@ -25,6 +25,7 @@ import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
import org.junit.runners.Parameterized
@@ -60,4 +61,16 @@ class OpenAppFromOverviewTest_ShellTransit(testSpec: FlickerTestParameter)
override fun before() {
assumeTrue(isShellTransitionsEnabled)
}
/** {@inheritDoc} */
@FlakyTest(bugId = 216266712)
@Test
override fun appWindowReplacesLauncherAsTopWindow() =
super.appWindowReplacesLauncherAsTopWindow()
/** {@inheritDoc} */
@FlakyTest(bugId = 218470989)
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
}