Merge "Add focus change assertions to FlickerTest"

2020-07-31 15:06:39 +00:00
parent 7ffce02546 bddbeea18d
commit 5a82063fe5
10 changed files with 72 additions and 3 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
@@ -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
@@ -130,4 +131,23 @@ fun LayersAssertion.statusBarLayerRotatesScales(
    end("statusBarLayerRotatesScales_EndingPos", enabled, bugId) {
        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()
+    }
 }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
@@ -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`)
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
@@ -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`)
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt
@@ -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,7 +95,13 @@ class PipToAppTest(
                    statusBarLayerRotatesScales(rotation)
                    pipLayerBecomesVisible()
                }
+
+                eventLog {
+                    focusChanges(
+                            "NexusLauncherActivity", testApp.launcherName, "NexusLauncherActivity",
+                            bugId = 151179149)
+                }
            }
        }
    }
-}
+}
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToHomeTest.kt
@@ -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)
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
@@ -22,6 +22,7 @@ import com.android.server.wm.flicker.NonRotationTestBase.Companion.SCREENSHOT_LA
 import com.android.server.wm.flicker.RotationTestBase
 import com.android.server.wm.flicker.StandardAppHelper
 import com.android.server.wm.flicker.dsl.flicker
+import com.android.server.wm.flicker.focusDoesNotChange
 import com.android.server.wm.flicker.helpers.WindowUtils
 import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
 import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible
@@ -119,6 +120,10 @@ class ChangeAppRotationTest(
                                )
                    }
                }
+
+                eventLog {
+                    focusDoesNotChange(bugId = 151179149)
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
@@ -24,6 +24,8 @@ import androidx.test.filters.LargeTest
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
 import com.android.server.wm.flicker.RotationTestBase
+import com.android.server.wm.flicker.dsl.flicker
+import com.android.server.wm.flicker.focusDoesNotChange
 import com.android.server.wm.flicker.helpers.WindowUtils
 import com.android.server.wm.flicker.dsl.flicker
 import com.android.server.wm.flicker.helpers.stopPackage
@@ -136,6 +138,10 @@ class SeamlessAppRotationTest(
                        }
                    }
                }
+
+                eventLog {
+                    focusDoesNotChange(bugId = 151179149)
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt
@@ -22,6 +22,7 @@ import androidx.test.filters.LargeTest
 import com.android.server.wm.flicker.NonRotationTestBase
 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.exitSplitScreen
 import com.android.server.wm.flicker.helpers.launchSplitScreen
 import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
@@ -93,6 +94,11 @@ class OpenAppToSplitScreenTest(
                                .showsLayer(DOCKED_STACK_DIVIDER)
                    }
                }
+
+                eventLog {
+                    focusChanges(testApp.`package`,
+                            "recents_animation_input_consumer", "NexusLauncherActivity")
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/ResizeSplitScreenTest.kt
@@ -19,15 +19,16 @@ package com.android.server.wm.flicker.splitscreen
 import android.graphics.Region
 import android.util.Rational
 import android.view.Surface
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.uiautomator.By
 import com.android.server.wm.flicker.FlickerTestBase
 import com.android.server.wm.flicker.StandardAppHelper
-import com.android.server.wm.flicker.helpers.WindowUtils
 import com.android.server.wm.flicker.dsl.flicker
+import com.android.server.wm.flicker.focusDoesNotChange
 import com.android.server.wm.flicker.helpers.ImeAppHelper
+import com.android.server.wm.flicker.helpers.WindowUtils
 import com.android.server.wm.flicker.helpers.exitSplitScreen
 import com.android.server.wm.flicker.helpers.isInSplitScreen
 import com.android.server.wm.flicker.helpers.launchSplitScreen
@@ -171,6 +172,10 @@ class ResizeSplitScreenTest : FlickerTestBase() {
                                .hasVisibleRegion(sImeActivity, bottomAppBounds)
                    }
                }
+
+                eventLog {
+                    focusDoesNotChange()
+                }
            }
        }
    }
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt
@@ -22,6 +22,7 @@ import androidx.test.filters.LargeTest
 import com.android.server.wm.flicker.FlickerTestBase
 import com.android.server.wm.flicker.StandardAppHelper
 import com.android.server.wm.flicker.dsl.flicker
+import com.android.server.wm.flicker.focusDoesNotChange
 import com.android.server.wm.flicker.helpers.exitSplitScreen
 import com.android.server.wm.flicker.helpers.isInSplitScreen
 import com.android.server.wm.flicker.helpers.launchSplitScreen
@@ -103,6 +104,10 @@ class SplitScreenToLauncherTest : FlickerTestBase() {
                            .hidesLayer(testApp.getPackage())
                    }
                }
+
+                eventLog {
+                    focusDoesNotChange(bugId = 151179149)
+                }
            }
        }
    }