Merge pull request #865 from square/sedwards/update-cyborgs

Update Poetry Cyborg for Perf Tests

Author: steve-the-edwards

benchmarks/performance-poetry/complex-poetry/src/androidTest/java/com/squareup/benchmarks/performance/complex/poetry/RenderPassTest.kt

@@ -12,11 +12,11 @@ import com.squareup.benchmarks.performance.complex.poetry.PerformancePoetryActiv
 import com.squareup.benchmarks.performance.complex.poetry.PerformancePoetryActivity.Companion.EXTRA_RUNTIME_FRAME_TIMEOUT
 import com.squareup.benchmarks.performance.complex.poetry.cyborgs.landscapeOrientation
 import com.squareup.benchmarks.performance.complex.poetry.cyborgs.openRavenAndNavigate
-import com.squareup.benchmarks.performance.complex.poetry.cyborgs.resetToRootPoetryList
 import com.squareup.benchmarks.performance.complex.poetry.cyborgs.waitForPoetry
 import com.squareup.benchmarks.performance.complex.poetry.instrumentation.RenderPassCountingInterceptor
 import org.junit.Assert.fail
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -61,30 +61,37 @@ class RenderPassTest {
     runRenderPassCounter(COMPLEX_INITIALIZING, useFrameTimeout = false)
   }
 
+  @Ignore
   @Test fun renderPassCounterBaselineComplexNoInitializingState() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING, useFrameTimeout = false)
   }
 
+  @Ignore
   @Test fun renderPassCounterBaselineComplexNoInitializingStateHighFrequencyEvents() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING_HIGH_FREQUENCY, useFrameTimeout = false)
   }
 
+  @Ignore
   @Test fun renderPassCounterBaselineComplexNoInitializingStateSimultaneous() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING_SIMULTANEOUS, useFrameTimeout = false)
   }
 
+  @Ignore
   @Test fun renderPassCounterFrameTimeoutComplexWithInitializingState() {
     runRenderPassCounter(COMPLEX_INITIALIZING, useFrameTimeout = true)
   }
 
+  @Ignore
   @Test fun renderPassCounterFrameTimeoutComplexNoInitializingState() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING, useFrameTimeout = true)
   }
 
+  @Ignore
   @Test fun renderPassCounterFrameTimeoutComplexNoInitializingStateHighFrequencyEvents() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING_HIGH_FREQUENCY, useFrameTimeout = true)
   }
 
+  @Ignore
   @Test fun renderPassCounterFrameTimeoutComplexNoInitializingStateSimultaneous() {
     runRenderPassCounter(COMPLEX_NO_INITIALIZING_SIMULTANEOUS, useFrameTimeout = true)
   }
@@ -113,11 +120,9 @@ class RenderPassTest {
     }
 
     InstrumentationRegistry.getInstrumentation().context.startActivity(intent)
-    device.waitForPoetry()
     device.waitForIdle()
-
-    // Go back to root list so this is deterministic.
-    device.resetToRootPoetryList()
+    device.waitForPoetry(10_000)
+    device.waitForIdle()
 
     // Now reset for the actual counting.
     renderPassCountingInterceptor.reset()
@@ -251,7 +256,7 @@ class RenderPassTest {
       useHighFrequencyRange = false,
       simultaneousActions = 0,
       baselineExpectation = RenderExpectation(
-        totalPasses = 56..56,
+        totalPasses = 54..54,
         freshRenderedNodes = 83..83,
         staleRenderedNodes = 605..605
       ),
@@ -287,7 +292,7 @@ class RenderPassTest {
         staleRenderedNodes = 2350..2350
       ),
       frameTimeoutExpectation = RenderExpectation(
-        totalPasses = 88..97, // On Pixel 6: 56..61
+        totalPasses = 87..97, // On Pixel 6: 56..61
         freshRenderedNodes = 106..108,
         staleRenderedNodes = 679..698
       )
@@ -305,7 +310,7 @@ class RenderPassTest {
         staleRenderedNodes = 38919..38919
       ),
       frameTimeoutExpectation = RenderExpectation(
-        totalPasses = 88..97, // on Pixel 6: 56..61,
+        totalPasses = 88..99, // on Pixel 6: 56..61,
         freshRenderedNodes = 176..180,
         staleRenderedNodes = 4690..4700
       )

benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/cyborgs/PoetryCyborgs.kt

@@ -1,29 +1,23 @@
 package com.squareup.benchmarks.performance.complex.poetry.cyborgs
 
 import android.widget.ImageButton
-import android.widget.ProgressBar
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.BySelector
+import androidx.test.uiautomator.StaleObjectException
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
 
 const val POETRY_PACKAGE = "com.squareup.benchmarks.performance.complex.poetry"
 val PoetryPackageSelector: BySelector =
-  By.pkg(POETRY_PACKAGE).depth(0)
-val LoadingDialogSelector: BySelector =
-  By.clazz(ProgressBar::class.java).res(POETRY_PACKAGE, "loading_progress_bar")
+  By.pkg(POETRY_PACKAGE)
 val RavenPoemSelector: BySelector = By.text("The Raven").clickable(true).focusable(true)
 val NextSelector: BySelector = By.textStartsWith("next")
 val PreviousSelector: BySelector = By.textEndsWith("previous")
 val UpButtonSelector: BySelector =
   By.clazz(ImageButton::class.java).descContains("Up").clickable(true)
 
-fun UiDevice.waitForLoadingInterstitial(timeout: Long = DEFAULT_UI_AUTOMATOR_TIMEOUT) {
-  wait(Until.hasObject(LoadingDialogSelector), timeout)
-}
-
 fun UiDevice.waitForPoetry(timeout: Long = DEFAULT_UI_AUTOMATOR_TIMEOUT) {
-  wait(Until.hasObject(PoetryPackageSelector), timeout)
+  waitFor(PoetryPackageSelector, timeout)
 }
 
 fun UiDevice.next(timeout: Long = DEFAULT_UI_AUTOMATOR_TIMEOUT) {
@@ -38,7 +32,7 @@ fun UiDevice.resetToRootPoetryList() {
   var uiObject = wait(Until.findObject(UpButtonSelector), DEFAULT_UI_AUTOMATOR_TIMEOUT)
   while (uiObject != null) {
     uiObject.click()
-    waitForLoadingInterstitial()
+    waitForWindowUpdate(POETRY_PACKAGE, DEFAULT_UI_AUTOMATOR_TIMEOUT)
     uiObject = wait(Until.findObject(UpButtonSelector), DEFAULT_UI_AUTOMATOR_TIMEOUT)
   }
 }
@@ -48,23 +42,44 @@ fun UiDevice.resetToRootPoetryList() {
  */
 fun UiDevice.openRavenAndNavigate() {
   waitForIdle()
-  waitForAndClick(RavenPoemSelector)
-  waitForLoadingInterstitial()
+  try {
+    waitForAndClick(RavenPoemSelector)
+  } catch (e: IllegalStateException) {
+    // may not be at root.
+    resetToRootPoetryList()
+    waitForAndClick(RavenPoemSelector)
+  }
+  waitForWindowUpdate(POETRY_PACKAGE, DEFAULT_UI_AUTOMATOR_TIMEOUT)
   waitForAndClick(By.textStartsWith("Deep into that darkness peering"))
-  waitForLoadingInterstitial()
+  waitForWindowUpdate(POETRY_PACKAGE, DEFAULT_UI_AUTOMATOR_TIMEOUT)
 
   repeat(5) {
-    next()
-    waitForLoadingInterstitial()
+    var fresh = false
+    while (!fresh) {
+      try {
+        fresh = true
+        next()
+      } catch (e: StaleObjectException) {
+        fresh = false
+      }
+      waitForWindowUpdate(POETRY_PACKAGE, DEFAULT_UI_AUTOMATOR_TIMEOUT)
+    }
   }
 
   repeat(5) {
-    previous()
-    waitForLoadingInterstitial()
+    var fresh = false
+    while (!fresh) {
+      try {
+        fresh = true
+        previous()
+      } catch (e: StaleObjectException) {
+        fresh = false
+      }
+      waitForWindowUpdate(POETRY_PACKAGE, DEFAULT_UI_AUTOMATOR_TIMEOUT)
+    }
   }
 
   waitForAndClick(UpButtonSelector)
-  waitForLoadingInterstitial()
 
   // Back to the start.
   waitFor(RavenPoemSelector)