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

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

Merge changes from topic "bubble_bar_handle" into main 

* changes:
  Refactor BubbleFlickerHelper to an object
  Verify dismissing with bubble bar handle
parents f145b362 1dec94cb

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/BubbleBarMovesTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ import com.android.wm.shell.Flags 
import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.bubbles.testcase.ExpandBubbleTestCases

import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.collapseBubbleAppViaTouchOutside

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.expandBubbleAppViaBubbleBar

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer

import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule

import com.android.wm.shell.flicker.bubbles.utils.collapseBubbleAppViaTouchOutside

import com.android.wm.shell.flicker.bubbles.utils.expandBubbleAppViaBubbleBar

import com.android.wm.shell.flicker.bubbles.utils.launchBubbleViaBubbleMenu

import com.google.common.truth.Truth.assertWithMessage

import org.junit.Assume.assumeTrue

import org.junit.Before
@@ -81,7 +81,7 @@ class BubbleBarMovesTest(navBar: NavBar) : BubbleFlickerTestBase(), ExpandBubble 
                Root.get().bubbleBar.dragToTheOtherSide()

                val bubbleBarAfterTransition = Root.get().bubbleBar.visibleCenter

                bubbleBarPosChanges = (bubbleBarBeforeTransition != bubbleBarAfterTransition)

                expandBubbleAppViaBubbleBar(uiDevice, testApp, wmHelper)

                expandBubbleAppViaBubbleBar(testApp, uiDevice, wmHelper)

            },

            tearDownAfterTransition = { testApp.exit(wmHelper) }

        )

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/CollapseBubbleAppViaBackTest.kt

+5 −9
Original line number Diff line number Diff line
@@ -17,19 +17,18 @@ 
package com.android.wm.shell.flicker.bubbles



import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.NavBar

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.bubbles.testcase.BubbleAppBecomesNotExpandedTestCases

import com.android.wm.shell.flicker.bubbles.testcase.BubbleAlwaysVisibleTestCases

import com.android.wm.shell.flicker.bubbles.testcase.BubbleAppBecomesNotExpandedTestCases

import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.collapseBubbleAppViaBackKey

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer

import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule

import com.android.wm.shell.flicker.bubbles.utils.collapseBubbleAppViaBackKey

import com.android.wm.shell.flicker.bubbles.utils.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.setUpBeforeTransition

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test
@@ -66,10 +65,7 @@ class CollapseBubbleAppViaBackTest(navBar: NavBar) : 
{

    companion object : FlickerPropertyInitializer() {

        private val recordTraceWithTransitionRule = RecordTraceWithTransitionRule(

            setUpBeforeTransition = {

                setUpBeforeTransition(instrumentation, wmHelper)

                launchBubbleViaBubbleMenu(testApp, tapl, wmHelper)

            },

            setUpBeforeTransition = { launchBubbleViaBubbleMenu(testApp, tapl, wmHelper) },

            transition = { collapseBubbleAppViaBackKey(testApp, tapl, wmHelper) },

            tearDownAfterTransition = { testApp.exit(wmHelper) }

        )

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/DismissExpandedBubbleViaBubbleBarHandleTest.kt

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.flicker.bubbles



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresFlagsEnabled

import android.tools.NavBar

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.Flags

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.bubbles.testcase.DismissExpandedBubbleTestCases

import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.dismissBubbleAppViaBubbleBarHandle

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer

import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule

import org.junit.Assume.assumeTrue

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.runners.MethodSorters



/**

 * Test dismiss bubble app via dragging bubble bar handle to the dismiss view when the bubble is in

 * expanded state.

 *

 * To run this test:

 *     `atest WMShellExplicitFlickerTestsBubbles:DismissExpandedBubbleViaBubbleBarHandleTest`

 *

 * Pre-steps:

 * ```

 *     Launch [testApp] into bubble

 * ```

 *

 * Actions:

 * ```

 *     Dismiss bubble app via dragging bubble bar handle to the dismiss view

 * ```

 * Verified tests:

 * - [BubbleFlickerTestBase]

 * - [DismissExpandedBubbleTestCases]

 */

@RequiresFlagsEnabled(Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE)

@RequiresDevice

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Presubmit

class DismissExpandedBubbleViaBubbleBarHandleTest(navBar: NavBar) : BubbleFlickerTestBase(),

    DismissExpandedBubbleTestCases {

    companion object : FlickerPropertyInitializer() {

        private val recordTraceWithTransitionRule = RecordTraceWithTransitionRule(

            setUpBeforeTransition = { launchBubbleViaBubbleMenu(testApp, tapl, wmHelper) },

            transition = { dismissBubbleAppViaBubbleBarHandle(testApp, wmHelper) },

            tearDownAfterTransition = { testApp.exit() }

        )

    }



    @get:Rule

    val setUpRule = ApplyPerParameterRule(

        Utils.testSetupRule(navBar).around(recordTraceWithTransitionRule),

        params = arrayOf(navBar)

    )



    override val traceDataReader

        get() = recordTraceWithTransitionRule.reader



    @Before

    override fun setUp() {

        // Bubble bar is only enabled on large screen device.

        assumeTrue(tapl.isTablet)

        super.setUp()

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/DismissExpandedBubbleViaBubbleViewTest.kt

+3 −7
Original line number Diff line number Diff line
@@ -25,11 +25,10 @@ import com.android.wm.shell.Flags 
import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.bubbles.testcase.DismissExpandedBubbleTestCases

import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.dismissBubbleAppViaBubbleView

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer

import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule

import com.android.wm.shell.flicker.bubbles.utils.dismissBubbleAppViaBubbleView

import com.android.wm.shell.flicker.bubbles.utils.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.setUpBeforeTransition

import org.junit.Assume.assumeFalse

import org.junit.Before

import org.junit.FixMethodOrder
@@ -65,10 +64,7 @@ class DismissExpandedBubbleViaBubbleViewTest(navBar: NavBar) : BubbleFlickerTest 
    DismissExpandedBubbleTestCases {

    companion object : FlickerPropertyInitializer() {

        private val recordTraceWithTransitionRule = RecordTraceWithTransitionRule(

            setUpBeforeTransition = {

                setUpBeforeTransition(instrumentation, wmHelper)

                launchBubbleViaBubbleMenu(testApp, tapl, wmHelper)

            },

            setUpBeforeTransition = { launchBubbleViaBubbleMenu(testApp, tapl, wmHelper) },

            transition = { dismissBubbleAppViaBubbleView(uiDevice, wmHelper) },

            tearDownAfterTransition = { testApp.exit() }

        )

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/src/com/android/wm/shell/flicker/bubbles/EnterBubbleViaBubbleMenuTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -24,10 +24,9 @@ import com.android.wm.shell.Flags 
import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.bubbles.testcase.EnterBubbleTestCases

import com.android.wm.shell.flicker.bubbles.utils.ApplyPerParameterRule

import com.android.wm.shell.flicker.bubbles.utils.BubbleFlickerTestHelper.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.FlickerPropertyInitializer

import com.android.wm.shell.flicker.bubbles.utils.RecordTraceWithTransitionRule

import com.android.wm.shell.flicker.bubbles.utils.launchBubbleViaBubbleMenu

import com.android.wm.shell.flicker.bubbles.utils.setUpBeforeTransition

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.runners.MethodSorters
@@ -55,7 +54,6 @@ open class EnterBubbleViaBubbleMenuTest(navBar: NavBar) : BubbleFlickerTestBase( 


    companion object : FlickerPropertyInitializer() {

        private val recordTraceWithTransitionRule = RecordTraceWithTransitionRule(

            setUpBeforeTransition = { setUpBeforeTransition(instrumentation, wmHelper) },

            transition = { launchBubbleViaBubbleMenu(testApp, tapl, wmHelper) },

            tearDownAfterTransition = { testApp.exit(wmHelper) }

        )