Update dependencies (#2460)

Update Compose BOM to 2024.11.00 Update Navigation to 2.8.4 Update Compose Material 3 to 1.0.0-alpha29 Update Compose to 1.5.0-alpha06 Update Paging Compose to 3.3.4 Update Robolectric to 4.14 Update Markdown renderer to 0.26.0 Update the Robolectric test target SDK to 35. * Fix: Suppress a11y TouchTargetSizeCheck on the screen edge Suppresses a TouchTargetSizeCheck accessibility error that occurs on the screen edge , specifically when the year is off-screen initially in the DatePicker composable. This change modifies the AccessibilityValidator configuration to ignore this specific error by adding a suppressing result matcher. Additionally, it enables screenshot capturing and saving during accessibility validation.
google · Nov 16, 2024 · facd0c0 · facd0c0
1 parent 59118ca
commit facd0c0
Show file tree

Hide file tree

Showing 1,045 changed files with 1,738 additions and 1,693 deletions.
diff --git a/....google.android.horologist.ai.composables.components_PromptScreenTest_empty.png b/....google.android.horologist.ai.composables.components_PromptScreenTest_empty.png
diff --git a/...om.google.android.horologist.auth.composables.chips_AccountChipTest_default.png b/...om.google.android.horologist.auth.composables.chips_AccountChipTest_default.png
diff --git a/...m.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png b/...m.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png
diff --git a/...sables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png b/...sables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png
diff --git a/...roid.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png b/...roid.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png
diff --git a/...oid.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png b/...oid.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png
diff --git a/...e.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png b/...e.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png
diff --git a/...gle.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png b/...gle.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png
diff --git a/...le.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png b/...le.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png
diff --git a/....horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png b/....horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png
diff --git a/...rologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png b/...rologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png
diff --git a/....google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png b/....google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png
diff --git a/...google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png b/...google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png
diff --git a/...d.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png b/...d.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png
diff --git a/...gist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png b/...gist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png
diff --git a/...ogle.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png b/...ogle.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png
diff --git a/...gle.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png b/...gle.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png
diff --git a/...orologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png b/...orologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png
diff --git a/...t.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png b/...t.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png
diff --git a/...com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png b/...com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png
diff --git a/...om.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png b/...om.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png
diff --git a/...roid.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png b/...roid.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png
diff --git a/...ologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png b/...ologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png
diff --git a/...mposables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png b/...mposables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png
diff --git a/....dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png b/....dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png
diff --git a/...es.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png b/...es.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png
diff --git a/...logs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png b/...logs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png
diff --git a/...les.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png b/...les.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png
diff --git a/...ogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png b/...ogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png
diff --git a/...dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png b/...dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png
diff --git a/...oid.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png b/...oid.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png
diff --git a/...gist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png b/...gist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png
diff --git a/...omposables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png b/...omposables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png
diff --git a/...logist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png b/...logist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png
diff --git a/...uth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png b/...uth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png
diff --git a/...uth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png b/...uth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png
diff --git a/...rologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png b/...rologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png
diff --git a/...ndroid.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png b/...ndroid.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png
diff --git a/...oid.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png b/...oid.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png
diff --git a/...id.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png b/...id.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png
diff --git a/...d.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png b/...d.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png
diff --git a/...st.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png b/...st.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerA11yTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerA11yTest.kt
@@ -20,11 +20,34 @@ import androidx.compose.ui.test.assertHasClickAction
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityViewCheckResult
+import com.google.android.apps.common.testing.accessibility.framework.checks.TouchTargetSizeCheck
+import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator
 import com.google.android.horologist.screenshots.rng.WearLegacyA11yTest
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
 import org.junit.Test
 import java.time.LocalDate
 
 class DatePickerA11yTest : WearLegacyA11yTest() {
+    override fun configureAccessibilityValidator(validator: AccessibilityValidator) {
+        super.configureAccessibilityValidator(validator)
+        validator.setSuppressingResultMatcher(
+            // Year is off screen initially
+            object : TypeSafeMatcher<AccessibilityViewCheckResult>() {
+                override fun matchesSafely(item: AccessibilityViewCheckResult): Boolean {
+                    val isTouchTargetCheck =
+                        item.accessibilityHierarchyCheck == TouchTargetSizeCheck::class.java
+                    return (isTouchTargetCheck && item.element?.boundsInScreen?.right == 454)
+                }
+
+                override fun describeTo(description: Description) {
+                    description.appendText("a TouchTargetSizeCheck on the screen edge")
+                }
+            },
+        )
+    }
+
     @Test
     fun screenshot() {
         enableTouchExploration()
@@ -48,28 +71,19 @@ class DatePickerA11yTest : WearLegacyA11yTest() {
             )
         }
 
-        composeRule.onNodeWithContentDescription("Next")
-            .assertHasClickAction()
-            .performClick()
+        composeRule.onNodeWithContentDescription("Next").assertHasClickAction().performClick()
 
-        composeRule.onNodeWithText("Day")
-            .assertExists()
+        composeRule.onNodeWithText("Day").assertExists()
         captureScreenshot("_1")
 
-        composeRule.onNodeWithContentDescription("Next")
-            .assertHasClickAction()
-            .performClick()
+        composeRule.onNodeWithContentDescription("Next").assertHasClickAction().performClick()
 
-        composeRule.onNodeWithText("Month")
-            .assertExists()
+        composeRule.onNodeWithText("Month").assertExists()
         captureScreenshot("_2")
 
-        composeRule.onNodeWithContentDescription("Next")
-            .assertHasClickAction()
-            .performClick()
+        composeRule.onNodeWithContentDescription("Next").assertHasClickAction().performClick()
 
-        composeRule.onNodeWithText("Year")
-            .assertExists()
+        composeRule.onNodeWithText("Year").assertExists()
         captureScreenshot("_3")
     }
 }
diff --git a/...es/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt b/...es/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.wear.compose.material.Text
+import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
 import com.google.common.truth.Truth.assertThat
 import org.junit.Assert
 import org.junit.Rule
@@ -39,8 +40,8 @@ import java.time.LocalDate
 
 @RunWith(RobolectricTestRunner::class)
 @Config(
-    sdk = [33],
-    qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav",
+    sdk = [35],
+    qualifiers = RobolectricDeviceQualifiers.WearOSLargeRound,
 )
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 class DatePickerInteractionTest {

diff --git a/.../kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt b/.../kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt
@@ -26,13 +26,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
 import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 
 @Config(
-    sdk = [33],
-    qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav",
+    sdk = [35],
+    qualifiers = RobolectricDeviceQualifiers.WearOSSquare,
 )
 class SquareSegmentedProgressIndicatorTest :
     WearLegacyScreenTest() {

diff --git a/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png b/...om.google.android.horologist.composables_DatePickerA11yTest_interactionTest.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_1.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_1.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_2.png
diff --git a/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_3.png b/....google.android.horologist.composables_DatePickerA11yTest_interactionTest_3.png
diff --git a/...ges/com.google.android.horologist.composables_DatePickerA11yTest_screenshot.png b/...ges/com.google.android.horologist.composables_DatePickerA11yTest_screenshot.png
diff --git a/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png b/...ots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
diff --git a/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png b/...com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png