A fully functional Android app built entirely with Kotlin and Jetpack Compose
Change order of exceptions
Yuri Schimke4f27c18f20fc
diff --git a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.ktindex 20cb09a6f..89994ac57 100644--- a/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt+++ b/core/screenshot-testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt@@ -31,7 +31,6 @@ import androidx.compose.ui.test.DarkModeimport androidx.compose.ui.test.DeviceConfigurationOverrideimport androidx.compose.ui.test.junit4.AndroidComposeTestRuleimport androidx.compose.ui.test.onRoot-import androidx.compose.ui.test.printToStringimport androidx.test.ext.junit.rules.ActivityScenarioRuleimport com.github.takahirom.roborazzi.ExperimentalRoborazziApiimport com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions@@ -44,6 +43,7 @@ import com.github.takahirom.roborazzi.captureRoboImageimport com.github.takahirom.roborazzi.checkRoboAccessibilityimport com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckPresetimport com.google.android.apps.common.testing.accessibility.framework.AccessibilityViewCheckResult+import com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityViewCheckExceptionimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport org.hamcrest.Matcherimport org.hamcrest.Matchers@@ -62,14 +62,19 @@ enum class DefaultTestDevices(val description: String, val spec: String) {FOLDABLE("foldable", "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480"),TABLET("tablet", "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=480"),}-fun <A : ComponentActivity> AndroidComposeTestRule<ActivityScenarioRule<A>, A>.captureMultiDevice(screenshotName: String,accessibilitySuppressions: Matcher<in AccessibilityViewCheckResult> = Matchers.not(Matchers.anything()),body: @Composable () -> Unit,) {- listOf(DefaultTestDevices.FOLDABLE).forEach {- this.captureForDevice(it.description, it.spec, screenshotName, body = body, accessibilitySuppressions = accessibilitySuppressions)+ DefaultTestDevices.entries.forEach {+ this.captureForDevice(+ deviceName = it.description,+ deviceSpec = it.spec,+ screenshotName = screenshotName,+ body = body,+ accessibilitySuppressions = accessibilitySuppressions,+ )}}@@ -98,20 +103,33 @@ fun <A : ComponentActivity> AndroidComposeTestRule<ActivityScenarioRule<A>, A>.c}}}++ // Run Accessibility checks first so logging is included+ val accessibilityException = try {+ this.onRoot().checkRoboAccessibility(+ roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions(+ failureLevel = CheckLevel.Warning,+ checker = RoborazziATFAccessibilityChecker(+ preset = AccessibilityCheckPreset.LATEST,+ suppressions = accessibilitySuppressions+ ),+ ),+ )+ null+ } catch (e: AccessibilityViewCheckException) {+ e+ }+this.onRoot().captureRoboImage("src/test/screenshots/${screenshotName}_$deviceName.png",roborazziOptions = roborazziOptions,)- this.onRoot().checkRoboAccessibility(- roborazziATFAccessibilityCheckOptions = RoborazziATFAccessibilityCheckOptions(- failureLevel = CheckLevel.Warning,- checker = RoborazziATFAccessibilityChecker(- preset = AccessibilityCheckPreset.LATEST,- suppressions = accessibilitySuppressions- ),- ),- )++ // Rethrow the Accessibility exception once screenshots have passed+ if (accessibilityException != null) {+ throw accessibilityException+ }}/**diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.ktindex 243e25263..29fc6f536 100644--- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt+++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt@@ -58,7 +58,8 @@ class ForYouScreenScreenshotTests {/*** Use a test activity to set the content on.*/- @get:Rule val composeTestRule = createAndroidComposeRule<ComponentActivity>()+ @get:Rule+ val composeTestRule = createAndroidComposeRule<ComponentActivity>()private val userNewsResources = UserNewsResourcePreviewParameterProvider().values.first()