Increase iOS Instrumented tests speed

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/platform/Accessibility.ios.kt

@@ -18,6 +18,7 @@ package androidx.compose.ui.platform
 
 import androidx.collection.MutableIntSet
 import androidx.compose.runtime.BroadcastFrameClock
+import androidx.compose.ui.animation.durationScale
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.node.HitTestResult
@@ -78,6 +79,7 @@ import kotlinx.cinterop.readValue
 import kotlinx.cinterop.useContents
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
@@ -1253,7 +1255,8 @@ internal class AccessibilityMediator(
             // Will exit on CancellationException from within await on `invalidationChannel.receive()`
             // when [job] is cancelled
             while (true) {
-                hasPendingInvalidations = false
+                @OptIn(ExperimentalCoroutinesApi::class)
+                hasPendingInvalidations = !invalidationChannel.isEmpty
                 invalidationChannel.receive()
                 hasPendingInvalidations = true
 
@@ -1269,24 +1272,24 @@ internal class AccessibilityMediator(
                             sync()
                         }
                         accessibilityDebugLogger?.log("AccessibilityMediator.sync took $time")
+
+                        if (keyboardFocusedElementKey != null) {
+                            // Do nothing.
+                            // When full keyboard access is enabled, the selection rectangle can be updated
+                            // on every frame. To improve the user experience, we should update the
+                            // accessibility tree as quickly as possible.
+                        } else {
+                            // Estimated delay between the iOS Accessibility Engine sync intervals.
+                            // There is no reason to post change notifications more frequently because the
+                            // iOS Accessibility Engine will ignore them.
+                            delay((100.0 * coroutineContext.durationScale()).milliseconds)
+                        }
                     }
                 } else if (root.element != null) {
                     refocusKeyboardElementIfNeeded()
                     root.element = null
                     AccessibilityNotification(UIAccessibilityLayoutChangedNotification).postNotification()
                 }
-
-                if (keyboardFocusedElementKey != null) {
-                    // Do nothing.
-                    // When full keyboard access is enabled, the selection rectangle can be updated
-                    // on every frame. To improve the user experience, we should update the
-                    // accessibility tree as quickly as possible.
-                } else {
-                    // Estimated delay between the iOS Accessibility Engine sync intervals.
-                    // There is no reason to post change notifications more frequently because the
-                    // iOS Accessibility Engine will ignore them.
-                    delay(100.milliseconds)
-                }
             }
         }
     }

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeContainer.ios.kt

@@ -206,7 +206,9 @@ internal class ComposeContainer(
     }
 
     fun hasInvalidations(): Boolean {
-        return mediator?.hasInvalidations == true || layersHolder?.layersViewController?.hasInvalidations == true
+        return mediator?.hasInvalidations == true ||
+            layersHolder?.layersViewController?.hasInvalidations == true ||
+            focusedViewsList.hasScheduledTasks
     }
 
     private val currentInterfaceOrientation: InterfaceOrientation?

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.ios.kt

@@ -488,7 +488,8 @@ internal class ComposeSceneMediator(
             keyboardManager.hasPendingWork ||
             isLayoutTransitionAnimating ||
             semanticsOwnerListener.hasInvalidations ||
-            textInputService.hasInvalidations
+            textInputService.hasInvalidations ||
+            interopContainer.hasPendingUpdates
     }
 
     init {

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/viewinterop/InteropTransaction.ios.kt

@@ -101,9 +101,12 @@ internal class InteropMutableTransaction(
     /**
      * Schedules a user-provided `UIKitView.update` or `UIKitViewController.update` callback.
      */
-    fun scheduleViewUpdate(holder: InteropViewHolder) {
+    fun scheduleViewUpdate(holder: InteropViewHolder, completion: () -> Unit) {
         if (holdersWithPendingViewUpdates.add(holder)) {
-            actions.add { holder.update() }
+            actions.add {
+                holder.update()
+                completion()
+            }
         }
     }
 }

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/viewinterop/IosInteropContainer.ios.kt

@@ -38,8 +38,10 @@ internal class IosInteropContainer(
 
     private val interopViews = mutableMapOf<InteropView, InteropViewHolder>()
     private var transaction = InteropMutableTransaction(isInteropActive = false)
+    private var scheduledUpdatesCount = 0
 
     val hasInteropViews: Boolean get() = interopViews.isNotEmpty()
+    val hasPendingUpdates: Boolean get() = transaction.hasPendingActions || scheduledUpdatesCount > 0
     val hasPendingViewUpdatesOnly: Boolean get() = transaction.hasPendingViewUpdatesOnly
 
     // TODO: Android reuses `owner.snapshotObserver`. We should probably do the same with RootNodeOwner.
@@ -140,14 +142,21 @@ internal class IosInteropContainer(
     }
 
     override fun scheduleUpdate(action: () -> Unit) {
+        scheduledUpdatesCount++
         // Add lambda to a list of commands which will be executed later
         // in the same [CATransaction], when the next rendered Compose frame is presented.
-        transaction.scheduleFrameSynchronizedAction(action)
+        transaction.scheduleFrameSynchronizedAction {
+            action()
+            scheduledUpdatesCount--
+        }
         requestRedraw()
     }
 
     override fun scheduleUpdate(holder: InteropViewHolder) {
-        transaction.scheduleViewUpdate(holder)
+        scheduledUpdatesCount++
+        transaction.scheduleViewUpdate(holder) {
+            scheduledUpdatesCount--
+        }
         requestRedraw()
     }
 

compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/window/FocusedViewsList.ios.kt

@@ -19,6 +19,7 @@ package androidx.compose.ui.window
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.util.fastForEachReversed
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -38,6 +39,12 @@ internal class FocusedViewsList {
     private var parent: FocusedViewsList? = null
     private val children = mutableListOf<FocusedViewsList>()
 
+    private var scheduledTasksCount = 0
+
+    val hasScheduledTasks: Boolean get() {
+        return scheduledTasksCount > 0 || children.any { it.hasScheduledTasks }
+    }
+
     /**
      * Add new view to list and focus on it.
      */
@@ -87,27 +94,39 @@ internal class FocusedViewsList {
 
         resignedViews += activeViews
         activeViews = emptyList()
+        scheduledTasksCount++
         mainScope.launch {
             resignScheduledViews()
+            scheduledTasksCount--
         }
     }
 
     private fun onListHierarchyChanged(delay: Duration?) {
         fun refocusOnLastViewInHierarchy() {
             val viewToFocus = lastViewToFocus()
             if (viewToFocus != null) {
+                scheduledTasksCount++
                 viewToFocus.becomeFirstResponder()
                 viewToFocus.window?.makeKeyWindow()
+                mainScope.launch {
+                    scheduledTasksCount--
+                }
             } else {
                 resignScheduledViews()
             }
         }
         if (delay == null) {
             refocusOnLastViewInHierarchy()
         } else {
+            scheduledTasksCount++
             mainScope.launch {
                 delay(delay)
                 refocusOnLastViewInHierarchy()
+
+                // With lots of show/hide keyboard requests, iOS postpones next operations for a while,
+                // which makes some tests fail. Adding a small delay to fix this issue.
+                delay(50.milliseconds)
+                scheduledTasksCount--
             }
         }
     }

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/animation/Animation.skiko.kt

@@ -17,6 +17,8 @@
 package androidx.compose.ui.animation
 
 import androidx.compose.runtime.withFrameNanos
+import androidx.compose.ui.MotionDurationScale
+import kotlin.coroutines.CoroutineContext
 import kotlin.math.min
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.nanoseconds
@@ -53,3 +55,7 @@ internal suspend fun withAnimationProgress(
         }
     }
 }
+
+internal fun CoroutineContext.durationScale(): Float {
+    return this[MotionDurationScale]?.scaleFactor ?: 1f
+}

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt

@@ -34,7 +34,7 @@ import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.ComposeUiFlags
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.MotionDurationScale
+import androidx.compose.ui.animation.durationScale
 import androidx.compose.ui.animation.easeOutTimingFunction
 import androidx.compose.ui.animation.withAnimationProgress
 import androidx.compose.ui.draw.drawBehind
@@ -64,7 +64,6 @@ import androidx.compose.ui.unit.IntRect
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.center
 import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner
-import kotlin.coroutines.CoroutineContext
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.currentCoroutineContext
@@ -416,7 +415,3 @@ internal fun getDialogScrimBlendMode(isWindowTransparent: Boolean) =
     } else {
         BlendMode.SrcOver
     }
-
-private fun CoroutineContext.durationScale(): Float {
-    return this[MotionDurationScale]?.scaleFactor ?: 1f
-}

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/integrations/ComposeSceneMediatorTest.kt

@@ -32,6 +32,7 @@ class ComposeSceneMediatorTest {
         tap(screenSize.center)
 
         waitForIdle()
+        // Should not crash
     }
 
     @OptIn(ExperimentalForeignApi::class)
@@ -45,5 +46,6 @@ class ComposeSceneMediatorTest {
         viewController.view.layoutIfNeeded()
 
         waitForIdle()
+        // Should not crash
     }
 }

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interaction/TextFieldEditMenuTest.kt

@@ -50,6 +50,7 @@ import androidx.compose.ui.test.assertVisibleInContainer
 import androidx.compose.ui.test.findNodeWithLabel
 import androidx.compose.ui.test.findNodeWithLabelOrNull
 import androidx.compose.ui.test.findNodeWithTag
+import androidx.compose.ui.test.isContextMenuVisible
 import androidx.compose.ui.test.runUIKitInstrumentedTest
 import androidx.compose.ui.test.tapContextMenuButton
 import androidx.compose.ui.test.utils.BasicTextFieldType
@@ -751,13 +752,16 @@ class TextFieldEditMenuTest {
 
     private fun UIKitInstrumentedTest.longPressNodeWithTagAndAwaitContextMenu(textFieldTag: String) {
         val touch = findNodeWithTag(textFieldTag).touchDown()
-        waitUntil {
-            findFirstDescendant { it.isLoupeView } != null
+        waitUntil("Awaiting context menu or loupe") {
+            isContextMenuVisible || isLoupeVisible
         }
         touch.up()
         waitForContextMenu()
     }
 
+    private val UIKitInstrumentedTest.isLoupeVisible: Boolean get() =
+        findFirstDescendant { it.isLoupeView } != null
+
     private fun UIKitInstrumentedTest.setTextFieldContent(
         textFieldKind: BasicTextFieldType,
         initialValue: TextFieldValue,

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/keyboard/KeyboardInsetsTest.kt

@@ -98,6 +98,8 @@ internal abstract class KeyboardInsetsTest(
         var focusManager: FocusManager? = null
         val focusRequester = FocusRequester()
 
+        animationSpeed = UIKitInstrumentedTest.DefaultAnimationSpeed
+
         setContent({
             onFocusBehavior = OnFocusBehavior.FocusableAboveKeyboard
         }) {
@@ -188,6 +190,8 @@ internal abstract class KeyboardInsetsTest(
         var focusManager: FocusManager? = null
         val focusRequester = FocusRequester()
 
+        animationSpeed = UIKitInstrumentedTest.DefaultAnimationSpeed
+
         setContent({
             onFocusBehavior = OnFocusBehavior.DoNothing
         }) {
@@ -590,6 +594,8 @@ internal abstract class KeyboardInsetsTest(
         val drawnTextFieldFrames = mutableListOf<Pair<Int, Int>>()
         val focusRequester = FocusRequester()
 
+        animationSpeed = UIKitInstrumentedTest.DefaultAnimationSpeed
+
         setContent({
             onFocusBehavior = OnFocusBehavior.FocusableAboveKeyboard
         }) {

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/modifiers/FrameRateTest.kt

@@ -31,6 +31,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.preferredFrameRate
+import androidx.compose.ui.test.UIKitInstrumentedTest
 import androidx.compose.ui.test.findNodeWithTag
 import androidx.compose.ui.test.runUIKitInstrumentedTest
 import kotlin.test.Test
@@ -43,6 +44,8 @@ internal class FrameRateTest {
     fun testLowFrameRates() = runUIKitInstrumentedTest {
         val frameRates = listOf(5f, 10f, 30f, 60f)
 
+        animationSpeed = UIKitInstrumentedTest.DefaultAnimationSpeed
+
         setContent {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
                 items(frameRates.size) { index ->
@@ -67,6 +70,8 @@ internal class FrameRateTest {
     fun testPreferredFrameRates() = runUIKitInstrumentedTest {
         val frameRates = listOf(5f, 10f, 30f, 60f, 80f, 120f)
 
+        animationSpeed = UIKitInstrumentedTest.DefaultAnimationSpeed
+
         setContent {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
                 items(frameRates.size) { index ->