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

Commit 1dec94cb authored by Charles Chen's avatar Charles Chen
Browse files

Refactor BubbleFlickerHelper to an object 

... to align kotlin bset practice.

Also do following refactorings:
1. Remove #setUpBeforeTransition - it's reduandant to setUpRule.
2. Move recordTraceWithTransition to RecordTraceWithTransitionRule
     - it's the only caller.

No logic changes.

Test: atest WMShellExplicitFlickerTestsBubbles
Bug: 396020056
Flag: TEST_ONLY
Change-Id: I26ba38426104492dd997fec5c5b21c1258bf135e
parent 789d8950

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

+3 −3
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

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

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,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.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 com.android.wm.shell.flicker.bubbles.utils.dismissBubbleAppViaBubbleBarHandle

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

import org.junit.Assume.assumeTrue

import org.junit.Before

import org.junit.FixMethodOrder

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) }

        )