commit bd2b15d80bb4d87e0e8e9469d670838973a54bb1
author mincheli <mincheli@google.com> Tue May 19 15:38:48 2020 +0800
committer mincheli <mincheli@google.com> Tue Jun 16 11:06:11 2020 +0800
tree 6fdd847cabeaad14f4d1592d351afceea9c9a064
parent 57e62e366d4770beb60d57873a7a8a784a6f45fb

Fix flaky test AccessibilityWindowQueryTest#testWindowDockAndUndock_dividerWindowAppearsAndDisappears

It's a flaky test.
Check the divider window if it is presented by a11y events,
TYPE_WINDOW_CONTENT_CHANGED, TYPE_WINDOWS_CHANGE.
And verify and pass the test case for 10 times.

Bug: 149725344
Test: atest android.accessibilityservice.cts.AccessibilityWindowQueryTest#testWindowDockAndUndock_dividerWindowAppearsAndDisappears --iteration
Change-Id: I10534bf98d90295250f8e075c97501287067cc50

tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index b37358f..252fbcb 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -150,11 +150,13 @@
     }
 
     private final AccessibilityEventFilter mDividerPresentFilter = (event) ->
-            (event.getEventType() == AccessibilityEvent.TYPE_WINDOWS_CHANGED)
+            (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED
+                    || event.getEventType() == TYPE_WINDOWS_CHANGED)
                     && isDividerWindowPresent();
 
     private final AccessibilityEventFilter mDividerAbsentFilter = (event) ->
-            (event.getEventType() == AccessibilityEvent.TYPE_WINDOWS_CHANGED)
+            (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED
+                    || event.getEventType() == TYPE_WINDOWS_CHANGED)
                     && !isDividerWindowPresent();
 
     @MediumTest
@@ -700,11 +702,14 @@
     }
 
     private boolean isDividerWindowPresent() {
-        List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
+        final List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
         final int windowCount = windows.size();
         for (int i = 0; i < windowCount; i++) {
-            AccessibilityWindowInfo window = windows.get(i);
-            if (window.getType() == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER) {
+            final AccessibilityWindowInfo window = windows.get(i);
+            final AccessibilityNodeInfo rootNode = window.getRoot();
+            if (window.getType() == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER &&
+                    rootNode != null &&
+                    rootNode.isVisibleToUser()) {
                 return true;
             }
         }