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

Commit 5a82063f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add focus change assertions to FlickerTest"

parents 7ffce025 bddbeea1

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker



import com.android.server.wm.flicker.dsl.EventLogAssertion

import com.android.server.wm.flicker.dsl.LayersAssertion

import com.android.server.wm.flicker.dsl.WmAssertion

import com.android.server.wm.flicker.helpers.WindowUtils
@@ -131,3 +132,22 @@ fun LayersAssertion.statusBarLayerRotatesScales( 
        this.hasVisibleRegion(FlickerTestBase.STATUS_BAR_WINDOW_TITLE, endingPos)

    }

}



fun EventLogAssertion.focusChanges(

    vararg windows: String,

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all(enabled = enabled, bugId = bugId) {

        this.focusChanges(windows)

    }

}



fun EventLogAssertion.focusDoesNotChange(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all(enabled = enabled, bugId = bugId) {

        this.focusDoesNotChange()

    }

}
 
 No newline at end of file

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm.flicker.launch 
import android.view.Surface

import androidx.test.filters.LargeTest

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.focusChanges

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -83,6 +84,10 @@ class OpenAppColdTest( 
                    statusBarLayerIsAlwaysVisible(bugId = 141361128)

                    wallpaperLayerBecomesInvisible(bugId = 141361128)

                }



                eventLog {

                    focusChanges("NexusLauncherActivity", testApp.`package`)

                }

            }

        }

    }

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.view.Surface 
import androidx.test.filters.LargeTest

import com.android.server.wm.flicker.StandardAppHelper

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.focusChanges

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -91,6 +92,10 @@ class OpenAppWarmTest( 
                    statusBarLayerIsAlwaysVisible(bugId = 141361128)

                    wallpaperLayerBecomesInvisible(bugId = 141361128)

                }



                eventLog {

                    focusChanges("NexusLauncherActivity", testApp.`package`)

                }

            }

        }

    }

tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.view.Surface 
import androidx.test.filters.FlakyTest

import androidx.test.filters.LargeTest

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.focusChanges

import com.android.server.wm.flicker.helpers.closePipWindow

import com.android.server.wm.flicker.helpers.expandPipWindow

import com.android.server.wm.flicker.helpers.hasPipWindow
@@ -94,6 +95,12 @@ class PipToAppTest( 
                    statusBarLayerRotatesScales(rotation)

                    pipLayerBecomesVisible()

                }



                eventLog {

                    focusChanges(

                            "NexusLauncherActivity", testApp.launcherName, "NexusLauncherActivity",

                            bugId = 151179149)

                }

            }

        }

    }

tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.view.Surface 
import androidx.test.filters.FlakyTest

import androidx.test.filters.LargeTest

import com.android.server.wm.flicker.dsl.flicker

import com.android.server.wm.flicker.focusChanges

import com.android.server.wm.flicker.helpers.closePipWindow

import com.android.server.wm.flicker.helpers.hasPipWindow

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
@@ -101,6 +102,10 @@ class PipToHomeTest( 
                    statusBarLayerRotatesScales(rotation)

                    pipLayerBecomesVisible()

                }



                eventLog {

                    focusChanges(testApp.launcherName, "NexusLauncherActivity", bugId = 151179149)

                }

            }

        }

    }