| commit | 7d4ff020866c4ab53a6ca5a781d542622bbf1a42 | [log] [tgz] |
|---|---|---|
| author | Levi Albuquerque <[email protected]> | Fri Sep 01 11:05:53 2023 +0100 |
| committer | Levi Albuquerque <[email protected]> | Fri Sep 01 11:06:24 2023 +0100 |
| tree | 8d970bd11c52e9685d39608a5ef51139e441b343 | |
| parent | 63399804091e016a06bac9e41b038f7e5a7c9e4c [diff] |
Fix flaky Macrobenchmark tests RecyclerViewAsCarouselBenchmark Fix class cast issue in RecyclerViewAsCarouselBenchmark. Test: N/A Relnote: N/A Fixes: 297398943 Change-Id: Ia3006ffd00507546f36a37e483d6844b66283a99
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_carousel.xml b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_carousel.xml index 61e862c..9b22250 100644 --- a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_carousel.xml +++ b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/activity_view_carousel.xml
@@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="400dp"> - <androidx.viewpager2.widget.ViewPager2 + <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/carousel" android:layout_gravity="center"
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/recycler_view_as_carousel_item.xml b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/recycler_view_as_carousel_item.xml index 03eb6bd..5b5aa07 100644 --- a/compose/integration-tests/macrobenchmark-target/src/main/res/layout/recycler_view_as_carousel_item.xml +++ b/compose/integration-tests/macrobenchmark-target/src/main/res/layout/recycler_view_as_carousel_item.xml
@@ -17,7 +17,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="200dp" android:background="#000000" - android:layout_height="200dp" + android:layout_height="match_parent" android:layout_gravity="center"> <TextView
diff --git a/compose/integration-tests/macrobenchmark/src/main/java/androidx/compose/integration/macrobenchmark/RecyclerViewAsCarouselBenchmark.kt b/compose/integration-tests/macrobenchmark/src/main/java/androidx/compose/integration/macrobenchmark/RecyclerViewAsCarouselBenchmark.kt index 2152280..0316577 100644 --- a/compose/integration-tests/macrobenchmark/src/main/java/androidx/compose/integration/macrobenchmark/RecyclerViewAsCarouselBenchmark.kt +++ b/compose/integration-tests/macrobenchmark/src/main/java/androidx/compose/integration/macrobenchmark/RecyclerViewAsCarouselBenchmark.kt
@@ -24,7 +24,6 @@ import androidx.test.uiautomator.UiDevice import androidx.testutils.createCompilationParams import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -46,7 +45,6 @@ } @Test - @Ignore("b/297398943") fun scroll() { val carousel = device.findObject( By.res(