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

Commit 0339051f authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Rename "Legacy" flicker classes

Having legacy in the name of the classes causes confusion. We should avoid using this, since they classes are not deprecated unlike the name suggests and we do want people to continue using them.

Flag: TEST_ONLY
Test: ensure presubmit builds everything successfully
Change-Id: Ibd394089f3bacd905a368a63d70673c7125e6073
parent 69dfa3b4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.wm.shell.flicker

import android.platform.test.rule.ScreenRecordRule
import android.tools.PlatformConsts.DEFAULT_DISPLAY
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.FlickerTest
import android.tools.flicker.rules.ChangeDisplayOrientationRule
import androidx.test.uiautomator.UiDevice

@@ -42,7 +42,7 @@ import org.junit.ClassRule
 * This will ensure that all the appropriate methods are called before running the tests.
 */
@ScreenRecordRule.ScreenRecord
abstract class DesktopModeBaseTest(flicker: LegacyFlickerTest) : BaseBenchmarkTest(flicker) {
abstract class DesktopModeBaseTest(flicker: FlickerTest) : BaseBenchmarkTest(flicker) {
    @get:Rule
    val testName = TestName()

+7 −7
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.wm.shell.flicker.fundamentals

import androidx.test.filters.RequiresDevice
import android.tools.NavBar
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.legacy.LegacyFlickerTestFactory
import android.tools.flicker.FlickerBuilder
import android.tools.flicker.FlickerTest
import android.tools.flicker.FlickerTestFactory
import android.tools.flicker.assertions.FlickerChecker
import android.tools.traces.component.ComponentNameMatcher
import com.android.wm.shell.Utils
import com.android.wm.shell.flicker.DesktopModeBaseTest
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized
@RequiresDevice
@RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
class CloseAllAppsViaAppHeaderExitTest(flicker: LegacyFlickerTest) : DesktopModeBaseTest(flicker) {
class CloseAllAppsViaAppHeaderExitTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {
    inner class CloseAllAppsWithAppHeaderExitScenario : CloseAllAppsWithAppHeaderExit(flicker.scenario.startRotation)

    @Rule
@@ -76,8 +76,8 @@ class CloseAllAppsViaAppHeaderExitTest(flicker: LegacyFlickerTest) : DesktopMode
    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests(
        fun getParams(): Collection<FlickerChecker> {
            return FlickerTestFactory.nonRotationTests(
                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
            )
        }
+7 −7
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.wm.shell.flicker.fundamentals

import androidx.test.filters.RequiresDevice
import android.tools.NavBar
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.legacy.LegacyFlickerTestFactory
import android.tools.flicker.FlickerBuilder
import android.tools.flicker.FlickerTest
import android.tools.flicker.FlickerTestFactory
import android.tools.flicker.assertions.FlickerChecker
import android.tools.traces.component.ComponentNameMatcher
import android.tools.traces.component.ComponentNameMatcher.Companion.DESKTOP_WALLPAPER_ACTIVITY
import com.android.wm.shell.Utils
@@ -43,7 +43,7 @@ import org.junit.runners.Parameterized
@RequiresDevice
@RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
class CloseAllAppsWithBackNavigationTest(flicker: LegacyFlickerTest) : DesktopModeBaseTest(flicker) {
class CloseAllAppsWithBackNavigationTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {
    inner class CloseAllAppsWithBackNavigationScenario :
        CloseAllAppsWithBackNavigation(
            navigationMode = flicker.scenario.navBarMode,
@@ -85,8 +85,8 @@ class CloseAllAppsWithBackNavigationTest(flicker: LegacyFlickerTest) : DesktopMo
    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests()
        fun getParams(): Collection<FlickerChecker> {
            return FlickerTestFactory.nonRotationTests()
        }
    }
}
 No newline at end of file
+7 −7
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.wm.shell.flicker.fundamentals

import androidx.test.filters.RequiresDevice
import android.tools.NavBar
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.legacy.LegacyFlickerTestFactory
import android.tools.flicker.FlickerBuilder
import android.tools.flicker.FlickerTest
import android.tools.flicker.FlickerTestFactory
import android.tools.flicker.assertions.FlickerChecker
import com.android.wm.shell.flicker.DesktopModeBaseTest
import com.android.wm.shell.scenarios.EnterDesktopFromSplitScreenWithAppHandleMenu
import com.android.wm.shell.Utils
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized
@RequiresDevice
@RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
class EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest(flicker: LegacyFlickerTest) : DesktopModeBaseTest(flicker) {
class EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {

    inner class EnterDesktopFromSplitScreenWithAppHandleMenuScenario : EnterDesktopFromSplitScreenWithAppHandleMenu(flicker.scenario.startRotation)

@@ -84,8 +84,8 @@ class EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest(flicker: LegacyFli
    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests(
        fun getParams(): Collection<FlickerChecker> {
            return FlickerTestFactory.nonRotationTests(
                    supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
            )
        }
+7 −7
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.wm.shell.flicker.fundamentals

import androidx.test.filters.RequiresDevice
import android.tools.NavBar
import android.tools.flicker.assertions.FlickerTest
import android.tools.flicker.assertions.FlickerChecker
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
import android.tools.flicker.legacy.LegacyFlickerTestFactory
import android.tools.flicker.FlickerBuilder
import android.tools.flicker.FlickerTest
import android.tools.flicker.FlickerTestFactory
import com.android.wm.shell.flicker.DesktopModeBaseTest
import com.android.wm.shell.flicker.utils.appWindowInsideDisplayBoundsAtEnd
import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd
@@ -40,7 +40,7 @@ import org.junit.runners.Parameterized
@RequiresDevice
@RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
class EnterDesktopWithAppHandleMenuFlickerTest(flicker: LegacyFlickerTest) :
class EnterDesktopWithAppHandleMenuFlickerTest(flicker: FlickerTest) :
    DesktopModeBaseTest(flicker) {
    inner class EnterDesktopWithAppHandleMenuScenario : EnterDesktopWithAppHandleMenu(flicker.scenario.startRotation)

@@ -75,8 +75,8 @@ class EnterDesktopWithAppHandleMenuFlickerTest(flicker: LegacyFlickerTest) :
    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun getParams(): Collection<FlickerTest> {
            return LegacyFlickerTestFactory.nonRotationTests(
        fun getParams(): Collection<FlickerChecker> {
            return FlickerTestFactory.nonRotationTests(
                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
            )
        }
Loading