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

Commit 3e2e0b3b authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Enable test EnterBubbleViaDragToBubbleBarTest in 3-button mode" into main

parents 13993a01 3f915f28
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ import org.junit.runners.Parameterized
 * The base class of Bubble flicker tests, which includes:
 * - Generic tests: checks there's no flicker in visible windows/layers
 * - Launcher visibility tests: checks launcher window/layer is always visible
 * - System Bars tests; checks the visibility of navigation and status bar
 * - System Bars tests: checks the visibility of navigation and status bar
 * - Verify all tests with both gestural and 3-button navigation mode
 */
@RunWith(Parameterized::class)
abstract class BubbleFlickerTestBase : BubbleFlickerSubjects {
+0 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import org.junit.Rule
import org.junit.Test
import org.junit.rules.TestRule
import org.junit.runners.MethodSorters
import org.junit.runners.Parameterized

/**
 * Test entering bubble via dragging the [testApp] icon from task bar to bubble bar location.
@@ -73,12 +72,6 @@ class EnterBubbleViaDragToBubbleBarTest(navBar: NavBar) : BubbleFlickerTestBase(
            transition = { launchBubbleViaDragToBubbleBar(testApp, tapl, wmHelper) },
            tearDownAfterTransition = { testApp.exit(wmHelper) }
        )

        // TODO(b/428566420): LauncherInstrumentation doesn't support to drag to bubble bar on 3
        //  button nav mode.
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
        fun data(): List<NavBar> = listOf(NavBar.MODE_GESTURAL)
    }

    @get:Rule