google · yschimke · Nov 7, 2024 · Nov 7, 2024 · Nov 7, 2024 · yschimke
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt
@@ -29,9 +29,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.hasScrollToNodeAction
+import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.wear.compose.material.ChipDefaults
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.MaterialTheme
@@ -105,11 +108,10 @@ class SectionedListTest : WearLegacyScreenTest() {
             }
         }
 
-        // TODO https://github.com/google/horologist/issues/2237
-//        composeRule.onNode(hasScrollToNodeAction())
-//            .performTouchInput { repeat(10) { swipeUp() } }
-//
-//        captureScreenshot()
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot()
     }
 
     @Test
@@ -151,11 +153,10 @@ class SectionedListTest : WearLegacyScreenTest() {
             }
         }
 
-        // TODO https://github.com/google/horologist/issues/2237
-//        composeRule.onNode(hasScrollToNodeAction())
-//            .performTouchInput { repeat(10) { swipeUp() } }
-//
-//        captureScreenshot()
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot()
     }
 
     @Test

diff --git a/...e.android.horologist.composables_SectionedListTest_failedSection_secondPage.png b/...e.android.horologist.composables_SectionedListTest_failedSection_secondPage.png
diff --git a/...e.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png b/...e.android.horologist.composables_SectionedListTest_loadedSection_secondPage.png
diff --git a/datalayer/watch/api/current.api b/datalayer/watch/api/current.api
@@ -13,7 +13,7 @@ package com.google.android.horologist.datalayer.watch {
     method public suspend Object? markSetupNoLongerComplete(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method @Deprecated public suspend Object? markTileAsInstalled(String tileName, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method @Deprecated public suspend Object? markTileAsRemoved(String tileName, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method @CheckResult public suspend Object? startCompanion(String nodeId, kotlin.coroutines.Continuation<? super error.NonExistentClass>);
+    method @CheckResult public suspend Object? startCompanion(String nodeId, kotlin.coroutines.Continuation<? super com.google.android.horologist.data.AppHelperResultCode>);
     method public suspend Object? updateInstalledTiles(kotlin.coroutines.Continuation<? super kotlin.Unit>);
     property public kotlinx.coroutines.flow.Flow<java.util.Set<com.google.android.gms.wearable.Node>> connectedAndInstalledNodes;
     property public final kotlinx.coroutines.flow.Flow<com.google.android.horologist.data.SurfacesInfo> surfacesInfo;

diff --git a/...roid/horologist/media/ui/screens/browse/PlaylistDownloadBrowseScreenA11yScreenshotTest.kt b/...roid/horologist/media/ui/screens/browse/PlaylistDownloadBrowseScreenA11yScreenshotTest.kt
@@ -16,6 +16,9 @@
 
 package com.google.android.horologist.media.ui.screens.browse
 
+import androidx.compose.ui.test.hasScrollToNodeAction
+import androidx.compose.ui.test.performTouchInput
+import androidx.test.espresso.action.ViewActions.swipeUp
 import com.google.android.horologist.media.ui.state.model.PlaylistDownloadUiModel
 import com.google.android.horologist.media.ui.state.model.PlaylistUiModel
 import com.google.android.horologist.screenshots.rng.WearLegacyA11yTest
@@ -58,11 +61,10 @@ class PlaylistDownloadBrowseScreenA11yScreenshotTest : WearLegacyA11yTest() {
             }
         }
 
-        // TODO https://github.com/google/horologist/issues/2237
-//        composeRule.onNode(hasScrollToNodeAction())
-//            .performTouchInput { repeat(10) { swipeUp() } }
-//
-//        captureScreenshot()
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot()
     }
 }
 

diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
@@ -26,7 +26,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.test.hasScrollToNodeAction
+import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.text.style.TextAlign
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.wear.compose.material.Chip
 import androidx.wear.compose.material.ChipDefaults
 import androidx.wear.compose.material.Icon
@@ -110,11 +113,10 @@ class DialogTest(device: Device) : WearLegacyScreenSizeTest(
             }
         }
 
-        // TODO https://github.com/google/horologist/issues/2237
-//        composeRule.onNode(hasScrollToNodeAction())
-//            .performTouchInput { repeat(10) { swipeUp() } }
-//
-//        captureScreenshot("_2")
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot("_2")
     }
 
     @Test
@@ -160,11 +162,10 @@ class DialogTest(device: Device) : WearLegacyScreenSizeTest(
             }
         }
 
-        // TODO https://github.com/google/horologist/issues/2237
-//        composeRule.onNode(hasScrollToNodeAction())
-//            .performTouchInput { repeat(10) { swipeUp() } }
-//
-//        captureScreenshot("_2")
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot("_2")
     }
 
     @Test

diff --git a/...rc/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt b/...rc/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt
@@ -22,7 +22,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.test.hasScrollToNodeAction
+import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.unit.dp
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.wear.compose.foundation.lazy.ScalingLazyListState
 import androidx.wear.compose.material.AppCard
 import androidx.wear.compose.material.Text
@@ -63,11 +66,10 @@ class ScalingLazyColumnDefaultsTest(device: Device) :
                 }
             }
 
-            // TODO https://github.com/google/horologist/issues/2237
-//            composeRule.onNode(hasScrollToNodeAction())
-//                .performTouchInput { repeat(10) { swipeUp() } }
-//
-//            captureScreenshot()
+            composeRule.onNode(hasScrollToNodeAction())
+                .performTouchInput { repeat(10) { swipeUp() } }
+
+            captureScreenshot()
         }
 
         @Test
@@ -114,11 +116,10 @@ class ScalingLazyColumnDefaultsTest(device: Device) :
                 }
             }
 
-            // TODO https://github.com/google/horologist/issues/2237
-//            composeRule.onNode(hasScrollToNodeAction())
-//                .performTouchInput { repeat(10) { swipeUp() } }
-//
-//            captureScreenshot()
+            composeRule.onNode(hasScrollToNodeAction())
+                .performTouchInput { repeat(10) { swipeUp() } }
+
+            captureScreenshot()
         }
 
         @Test
@@ -129,11 +130,10 @@ class ScalingLazyColumnDefaultsTest(device: Device) :
                 SampleChipMenu(columnState = columnState)
             }
 
-            // TODO https://github.com/google/horologist/issues/2237
-//            composeRule.onNode(hasScrollToNodeAction())
-//                .performTouchInput { repeat(10) { swipeUp() } }
-//
-//            captureScreenshot()
+            composeRule.onNode(hasScrollToNodeAction())
+                .performTouchInput { repeat(10) { swipeUp() } }
+
+            captureScreenshot()
         }
 
         @Composable

diff --git a/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt b/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt
@@ -110,69 +110,62 @@ class ScalingLazyColumnExamplesTest(device: Device) : WearLegacyScreenSizeTest(
         runTest(capture = false) {
             Bottom1Button()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottom2Buttons() {
         runTest(capture = false) {
             Bottom2Buttons()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottom3Buttons() {
         runTest(capture = false) {
             Bottom3Buttons()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherChips() {
         runTest(capture = false) {
             BottomOtherChips()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherCards() {
         runTest(capture = false) {
             BottomOtherCards()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottomUnspecified() {
         runTest(capture = false) {
             BottomUnspecified()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherText() {
         runTest(capture = false) {
             BottomOtherText()
         }
-        // TODO https://github.com/google/horologist/issues/2237
-//        scrollToBottom()
-//        captureScreenshot()
+        scrollToBottom()
+        captureScreenshot()
     }
 
     private fun scrollToBottom() {

diff --git a/...orologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png b/...orologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png
diff --git a/...rologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png b/...rologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png
diff --git a/...ist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png b/...ist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png
diff --git a/....horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png b/....horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png b/...horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png
diff --git a/...horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png b/...horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png
diff --git a/...rologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png b/...rologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png
diff --git a/...logist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png b/...logist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png
diff --git a/...horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png b/...horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png
diff --git a/...orologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png b/...orologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png
diff --git a/...gist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png b/...gist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png
diff --git a/...d.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png b/...d.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png b/....horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png
diff --git a/....horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png b/....horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png
diff --git a/...orologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png b/...orologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png
diff --git a/...ologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png b/...ologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png
diff --git a/...es_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png b/...es_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png
diff --git a/...s_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png b/...s_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png
diff --git a/...lingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png b/...lingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png
diff --git a/...izes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png b/...izes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png
diff --git a/...zes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png b/...zes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png
diff --git a/...zes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png b/...zes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png
diff --git a/...s_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png b/...s_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png
diff --git a/...ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png b/...ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png
diff --git a/...izes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png b/...izes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png
diff --git a/...zes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png b/...zes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png
diff --git a/...calingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png b/...calingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png
diff --git a/...nsizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png b/...nsizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png
diff --git a/...sizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png b/...sizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png
diff --git a/...sizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png b/...sizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png