From c9ffbfb7cfe15039b803989d4d2d51b449acacc3 Mon Sep 17 00:00:00 2001
From: Luis Machado <luis.machado@arm.com>
Date: Wed, 13 Nov 2024 17:48:41 +0000
Subject: [PATCH] [workloads/jetnews] Improve reliability of object detection

I noticed we were sometimes getting stale object exceptions. To help prevent
that situation from happening, pass around resource id's for the objects and
only fetch an instance of the objects whenever we need to click/scroll.

This means the time between fetching the object and using it is short, and
hopefully the object won't go stale or get recycled in that brief moment,
preventing the stale exceptions.
---
 .../jetnews/com.arm.wa.uiauto.jetnews.apk     | Bin 1549135 -> 1549617 bytes
 .../uiauto/jetnews/UiAutomationJankTests.java | 255 +++++++++++-------
 2 files changed, 159 insertions(+), 96 deletions(-)

diff --git a/wa/workloads/jetnews/com.arm.wa.uiauto.jetnews.apk b/wa/workloads/jetnews/com.arm.wa.uiauto.jetnews.apk
index c84b0faf45bbd17c56086164e1430b8ccbe8bbc1..d365b3d72ece889b865431d75ae450ac45e9af24 100644
GIT binary patch
delta 11422
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
Z=HK^!SFS&!7nJfhga)Di7vvxNzW~N|0AT<C

delta 11070
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
T<OiwvKu`*ROsJcQz!&;If-Nyg

diff --git a/wa/workloads/jetnews/uiauto/app/src/main/java/com/arm/wa/uiauto/jetnews/UiAutomationJankTests.java b/wa/workloads/jetnews/uiauto/app/src/main/java/com/arm/wa/uiauto/jetnews/UiAutomationJankTests.java
index 9c7b9437..b429eb30 100644
--- a/wa/workloads/jetnews/uiauto/app/src/main/java/com/arm/wa/uiauto/jetnews/UiAutomationJankTests.java
+++ b/wa/workloads/jetnews/uiauto/app/src/main/java/com/arm/wa/uiauto/jetnews/UiAutomationJankTests.java
@@ -47,9 +47,9 @@ import com.arm.wa.uiauto.ActionLogger;
 // things get setup properly (parameters, screen orientation etc).
 
 public class UiAutomationJankTests extends JankTestBase {
-    private static final int DEFAULT_BENCHMARK_REPEAT_COUNT = 1;
-    private static final int DEFAULT_TIMEOUT = 1000;
-    private static final int DEFAULT_BENCHMARK_FLING_SPEED = 5000;
+    private static final int DEFAULT_BENCHMARK_REPEAT_COUNT = 5;
+    private static final int DEFAULT_TIMEOUT = 100;
+    private static final int DEFAULT_BENCHMARK_FLING_SPEED = 20000;
     private static final String[] DEFAULT_BENCHMARK_TESTS
         = {"PortraitVerticalTest",
            "PortraitHorizontalTest",
@@ -59,9 +59,14 @@ public class UiAutomationJankTests extends JankTestBase {
 
     private static final String MAIN_VIEW = "ArticlesMainScrollView";
     private static final String TOP_ARTICLE = "TopStoriesForYou";
+    private static final String FIRST_POST = "PostCardSimple0";
+    private static final String FIRST_POST_CONTENT = "PostContent0";
+    private static final String ARTICLE_VIEW = "ArticleView";
     private static final String BOTTOM_ARTICLE = "PostCardHistory19";
     private static final String POPULAR_LIST = "PopularOnJetnewsRow";
-    private static final String ARTICLE_VIEW = "ArticleHomeScreenPreview0";
+    private static final String ARTICLE_PREVIEW = "ArticleHomeScreenPreview0";
+    private static final String FIRST_POPULAR_CARD = "PostCardPopular0";
+    private static final String LAST_POPULAR_CARD = "PostCardPopular10";
 
     private UiAutomation mUiAutomation;
     private int repeat;
@@ -85,6 +90,7 @@ public class UiAutomationJankTests extends JankTestBase {
                     = new ActionLogger("PortraitVerticalTest",
                                        mUiAutomation.getParams());
                 logger.start();
+                resetAppState();
                 runPortraitVerticalTests();
                 logger.stop();
             }
@@ -94,6 +100,7 @@ public class UiAutomationJankTests extends JankTestBase {
                     = new ActionLogger("PortraitHorizontalTest",
                                        mUiAutomation.getParams());
                 logger.start();
+                resetAppState();
                 runPortraitHorizontalTests();
                 logger.stop();
             }
@@ -103,116 +110,158 @@ public class UiAutomationJankTests extends JankTestBase {
                     = new ActionLogger("LandscapeVerticalTest",
                                        mUiAutomation.getParams());
                 logger.start();
+                resetAppState();
                 runLandscapeVerticalTests();
                 logger.stop();
             }
         }
     }
 
+    // Returns true if the main view is in focus. False otherwise.
+    private boolean findMainView() throws Exception {
+        return mDevice.wait(Until.findObject(By.res(MAIN_VIEW)), DEFAULT_TIMEOUT) != null;
+    }
+
+    // Scroll the object with resource id ARTICLES_ID to the bottom end and
+    // back to the top end. It is also used to scroll sideways if the controls
+    // allow such movement.
+    private void scrollList(String articles_id, String top_id, String bottom_id,
+                            boolean sideways) throws Exception {
+        // Scroll down and up in the articles list.
+        assert(scrollTo(articles_id, bottom_id, true, top_id,
+                        bottom_id, sideways, true, fling_speed));
+        assert(scrollTo(articles_id, top_id, false, top_id,
+                        bottom_id, sideways, true, fling_speed));
+    }
+
+    // Scroll the object with resource id ARTICLES_ID down until the object with
+    // resource id ARTICLE_NAME is visible and return true. If the object is not
+    // visible, return false.
+    private boolean scrollToArticle(String articles_id,
+                                      String article_name) throws Exception {
+        // Scroll downwards until we find the item named ARTICLE_NAME on screen.
+        // We reduce the fling speed so we don't skip past it on devices with
+        // screens that are too small (less area to display things) or too
+        // big (fast scrolling).
+        scrollTo(articles_id, article_name, true, TOP_ARTICLE, BOTTOM_ARTICLE,
+                 false, true, 1000);
+
+        return mDevice.findObject(By.res(article_name)) != null;
+    }
+
+    // Assuming an object with resource id ARTICLE_ID is in view, click it,
+    // wait for the article to open, fling downwards and upwards.
+    //
+    // This is shared with landscape mode as well, so we don't try to back out
+    // from the opened article, since landscape mode presents a split view of
+    // the scroll list and the article's contents.
+    private void interactWithArticle(String article_id) throws Exception {
+        UiObject2 article
+            = mDevice.wait(Until.findObject(By.res(article_id)),
+                           DEFAULT_TIMEOUT);
+
+        ViewMatchers.assertThat(article, CoreMatchers.notNullValue());
+
+        article.click();
+
+        // Wait for the clicked article to appear.
+        UiObject2 article_view
+            = mDevice.wait(Until.findObject(By.res(ARTICLE_PREVIEW)),
+                           DEFAULT_TIMEOUT);
+
+        // If it is a small screen device or portrait mode, we may not have a
+        // preview window, so look for a fullscreen article view.
+        if (article_view == null) {
+
+            article_view
+                = mDevice.wait(Until.findObject(By.res(FIRST_POST_CONTENT)),
+                               DEFAULT_TIMEOUT);
+        }
+
+        // Interact with the opened article by flinging up and down once.
+        ViewMatchers.assertThat(article_view, CoreMatchers.notNullValue());
+        article_view.setGestureMarginPercentage(0.2f);
+        article_view.fling(Direction.DOWN, fling_speed);
+        article_view.fling(Direction.UP, fling_speed);
+
+        UiObject2 refresh_button
+            = mDevice.wait(Until.findObject(By.text("Retry")),
+                           DEFAULT_TIMEOUT);
+
+        if (refresh_button != null)
+            refresh_button.click();
+    }
+
+    // Reset the app state for a new test.
+    private void resetAppState() throws Exception {
+        mDevice.setOrientationPortrait();
+
+        // FIXUP for differences between tablets and small phones.
+        // Sometimes, when flipping back from landscape to portrait, the app
+        // will switch to a view of the article, and we might need to back out
+        // to the main view.
+        UiObject2 article_view
+            = mDevice.wait(Until.findObject(By.res(FIRST_POST_CONTENT)),
+                           DEFAULT_TIMEOUT);
+
+        // If we see the article view, back out from it.
+        if (article_view != null)
+            mDevice.pressBack();
+
+        mDevice.setOrientationNatural();
+
+        // Now make sure the main view is visible.
+        while (mDevice.wait(Until.findObject(By.res(MAIN_VIEW)),
+               DEFAULT_TIMEOUT) == null) {};
+
+        // Scroll up to the top of the articles list.
+        scrollTo(MAIN_VIEW, TOP_ARTICLE, false, TOP_ARTICLE,
+                 BOTTOM_ARTICLE, false, true, fling_speed);
+    }
+
     private void runPortraitVerticalTests() throws Exception {
         mDevice.setOrientationPortrait();
-        mDevice.wait(Until.findObject(By.res(MAIN_VIEW)), DEFAULT_TIMEOUT);
-        UiObject2 articles = mDevice.findObject(By.res(MAIN_VIEW));
-        ViewMatchers.assertThat(articles, CoreMatchers.notNullValue());
 
-        scrollTo(articles, BOTTOM_ARTICLE, true, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true, fling_speed);
-        scrollTo(articles, TOP_ARTICLE, false, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true, fling_speed);
-
-        mDevice.click(articles.getVisibleCenter().x,
-                      articles.getVisibleCenter().y);
-
-        // Fling the article back and forth.
-        UiObject2 article = mDevice.findObject(By.scrollable(true));
-
-        article.fling(Direction.DOWN, fling_speed);
-        article.fling(Direction.UP, fling_speed);
-
-        // Go back to the main screen.
-        mDevice.pressBack();
+        assert(findMainView());
+        scrollList(MAIN_VIEW, TOP_ARTICLE, BOTTOM_ARTICLE, false);
+        assert(scrollToArticle(MAIN_VIEW, FIRST_POST));
+        interactWithArticle(FIRST_POST);
     }
 
     private void runPortraitHorizontalTests() throws Exception {
         mDevice.setOrientationPortrait();
-        mDevice.wait(Until.findObject(By.res(MAIN_VIEW)), DEFAULT_TIMEOUT);
-        UiObject2 articles = mDevice.findObject(By.res(MAIN_VIEW));
-        ViewMatchers.assertThat(articles, CoreMatchers.notNullValue());
-        
-        scrollTo(articles, TOP_ARTICLE, false, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true, fling_speed);
 
-        // Scroll downwards until the first postcard in the list is on screen.
-        // We reduce the fling speed so we don't skip past it on devices with
-        // screens that are too small or too big (fast scrolling).
-        scrollTo(articles, POPULAR_LIST, true, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true,
-                 (fling_speed / 5) < 1000? 1000 : fling_speed);
-        
-        UiObject2 article = mDevice.findObject(By.res(POPULAR_LIST));
-        article.fling(Direction.RIGHT,
-                      fling_speed > 10000? 10000 : fling_speed);
-        article.fling(Direction.LEFT, fling_speed);
-        scrollTo(articles, BOTTOM_ARTICLE, true, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true, fling_speed);
-        scrollTo(articles, TOP_ARTICLE, false, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true, fling_speed);
+        assert(findMainView());
+        scrollList(MAIN_VIEW, TOP_ARTICLE, BOTTOM_ARTICLE, false);
+        assert(scrollToArticle(MAIN_VIEW, "PostCardHistory0"));
+        assert(scrollToArticle(MAIN_VIEW, POPULAR_LIST));
+
+        // Scroll the horizontal list to the end and back.
+        scrollList(POPULAR_LIST, FIRST_POPULAR_CARD, LAST_POPULAR_CARD, true);
+        // Fetch the first article on the horizontal scroll list.
+        interactWithArticle(FIRST_POPULAR_CARD);
     }
 
     private void runLandscapeVerticalTests() throws Exception {
         // Flip the screen sideways to exercise the other layout
         // of the Jetnews app.
         mDevice.setOrientationLandscape();
-        mDevice.wait(Until.findObject(By.res(MAIN_VIEW)), DEFAULT_TIMEOUT);
 
-        // On some devices with smaller screens, the landscape test may not
-        // be supported, as the screen space is too small to display both
-        // the list of articles and the article preview view.
-        // In that case, skip the portion of the test that interacts with
-        // the preview view.
-        UiObject2 articles = mDevice.findObject(By.res(MAIN_VIEW));
-        ViewMatchers.assertThat(articles, CoreMatchers.notNullValue());
-
-        articles.setGestureMarginPercentage(0.2f);
-        scrollTo(articles, BOTTOM_ARTICLE, true, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true,
-                 fling_speed);
-        scrollTo(articles, TOP_ARTICLE, false, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true,
-                 fling_speed);
-        
-        // Scroll downwards until the first postcard in the list is on screen.
-        // We reduce the fling speed so we don't skip past it on devices with
-        // screens that are too small or too big (fast scrolling).
-        scrollTo(articles, "PostCardSimple0", true, TOP_ARTICLE,
-                 BOTTOM_ARTICLE, false, true,
-                 (fling_speed / 5) < 1000? 1000 : fling_speed);
-
-        UiObject2 article_to_click = mDevice.findObject(By.res("PostCardSimple0"));
-        article_to_click.click();
-
-        // Wait for the clicked article to appear.
-        UiObject2 article = mDevice.wait(
-            Until.findObject(By.res(ARTICLE_VIEW)),
-            DEFAULT_TIMEOUT
-        );
-
-        article.setGestureMarginPercentage(0.2f);
-        article.fling(Direction.DOWN, fling_speed);
-        article.fling(Direction.UP, fling_speed);
-
-        mDevice.setOrientationPortrait();
-        mDevice.pressBack();
+        assert(findMainView());
+        scrollList(MAIN_VIEW, TOP_ARTICLE, BOTTOM_ARTICLE, false);
+        assert(scrollToArticle(MAIN_VIEW, FIRST_POST));
+        interactWithArticle(FIRST_POST);
     }
 
-    private void scrollTo(UiObject2 element,
-                          String resourceId, boolean downFirst,
-                          String beginningId, String endId, boolean sideways,
-                          boolean fling, int swipeSpeed) {
+    private boolean scrollTo(String element_id,
+                             String resourceId, boolean downFirst,
+                             String beginningId, String endId, boolean sideways,
+                             boolean fling, int swipeSpeed) {
         // First check if the resource is in view. If it is, then just return.
-        if (element.hasObject(By.res(resourceId))) {
+        if (mDevice.wait(Until.findObject(By.res(resourceId)),
+                         DEFAULT_TIMEOUT) != null) {
             Log.d(LOG_TAG, "Object " + resourceId + " was already in view.");
-            return;
+            return true;
         }
 
         Direction direction;
@@ -230,19 +279,33 @@ public class UiAutomationJankTests extends JankTestBase {
             Log.d(LOG_TAG,
                   "Object " + resourceId + " is not in view. Scrolling.");
             do {
+                UiObject2 element = mDevice.wait(Until.findObject(By.res(element_id)),
+                                                 DEFAULT_TIMEOUT);
+                element.setGestureMarginPercentage(0.2f);
+
                 if (fling)
                     element.fling(direction, swipeSpeed);
                 else
                     element.scroll(direction, 0.3f);
 
-                // If we found it, just return. Otherwise keep going.
-                if (element.findObject(By.res(resourceId)) != null) {
-                    Log.d(LOG_TAG,
-                          "Object " + resourceId + " found while scrolling.");
-                    return;
+                UiObject2 refresh_button
+                    = mDevice.wait(Until.findObject(By.text("Retry")),
+                                   DEFAULT_TIMEOUT);
+
+                if (refresh_button != null) {
+                    refresh_button.click();
                 }
 
-            } while (!mDevice.hasObject(By.res(markerId)));
+                // If we found it, just return. Otherwise keep going.
+                if (mDevice.wait(Until.findObject(By.res(resourceId)),
+                                 DEFAULT_TIMEOUT) != null) {
+                    Log.d(LOG_TAG,
+                          "Object " + resourceId + " found while scrolling.");
+                    return true;
+                }
+
+            } while (mDevice.wait(Until.findObject(By.res(markerId)),
+                                  DEFAULT_TIMEOUT) == null);
 
             if (direction == Direction.DOWN)
                 direction = Direction.UP;
@@ -261,7 +324,7 @@ public class UiAutomationJankTests extends JankTestBase {
                 markerId = beginningId;
         }
         // We should've found it. If it is not here, it doesn't exist.
-        return;
+        return false;
     }
 
     @Override