A fully functional Android app built entirely with Kotlin and Jetpack Compose
Adds dark screenshot tests and fixes background colors in ForYou (#918)
Jose Alcérreca5b7986932474
diff --git a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.ktindex e0756d16d..85a95b796 100644--- a/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt+++ b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/ScreenshotHelper.kt@@ -28,6 +28,7 @@ import com.github.takahirom.roborazzi.RoborazziOptionsimport com.github.takahirom.roborazzi.RoborazziOptions.CompareOptionsimport com.github.takahirom.roborazzi.RoborazziOptions.RecordOptionsimport com.github.takahirom.roborazzi.captureRoboImage+import com.google.accompanist.testharness.TestHarnessimport org.robolectric.RuntimeEnvironmentval DefaultRoborazziOptions =@@ -36,16 +37,17 @@ val DefaultRoborazziOptions =recordOptions = RecordOptions(resizeScale = 0.5), // Reduce the size of the PNGs)+enum class DefaultTestDevices(val description: String, val spec: String) {+ PHONE("phone", "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480"),+ 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,body: @Composable () -> Unit,) {- listOf(- "phone" to "spec:shape=Normal,width=640,height=360,unit=dp,dpi=480",- "foldable" to "spec:shape=Normal,width=673,height=841,unit=dp,dpi=480",- "tablet" to "spec:shape=Normal,width=1280,height=800,unit=dp,dpi=480",- ).forEach {- this.captureForDevice(it.first, it.second, screenshotName, body)+ DefaultTestDevices.values().forEach {+ this.captureForDevice(it.description, it.spec, screenshotName, body = body)}}@@ -53,8 +55,9 @@ fun <A : ComponentActivity> AndroidComposeTestRule<ActivityScenarioRule<A>, A>.cdeviceName: String,deviceSpec: String,screenshotName: String,- body: @Composable () -> Unit,roborazziOptions: RoborazziOptions = DefaultRoborazziOptions,+ darkMode: Boolean = false,+ body: @Composable () -> Unit,) {val (width, height, dpi) = extractSpecs(deviceSpec)@@ -65,7 +68,9 @@ fun <A : ComponentActivity> AndroidComposeTestRule<ActivityScenarioRule<A>, A>.cCompositionLocalProvider(LocalInspectionMode provides true,) {- body()+ TestHarness(darkMode = darkMode) {+ body()+ }}}this.onRoot()diff --git a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.ktindex 410619638..1c521d419 100644--- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt+++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt@@ -17,14 +17,19 @@package com.google.samples.apps.nowinandroid.feature.foryouimport androidx.activity.ComponentActivity+import androidx.compose.runtime.Composableimport androidx.compose.ui.test.junit4.createAndroidComposeRule+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme+import com.google.samples.apps.nowinandroid.core.testing.util.DefaultTestDevices+import com.google.samples.apps.nowinandroid.core.testing.util.captureForDeviceimport com.google.samples.apps.nowinandroid.core.testing.util.captureMultiDeviceimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Successimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Loadingimport com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.NotShown+import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Shownimport dagger.hilt.android.testing.HiltTestApplicationimport org.junit.Beforeimport org.junit.Rule@@ -60,7 +65,7 @@ class ForYouScreenScreenshotTests {}@Test- fun testForYouScreenPopulatedFeed() {+ fun forYouScreenPopulatedFeed() {composeTestRule.captureMultiDevice("ForYouScreenPopulatedFeed") {NiaTheme {ForYouScreen(@@ -82,7 +87,7 @@ class ForYouScreenScreenshotTests {}@Test- fun testForYouScreenLoading() {+ fun forYouScreenLoading() {composeTestRule.captureMultiDevice("ForYouScreenLoading") {NiaTheme {ForYouScreen(@@ -102,16 +107,54 @@ class ForYouScreenScreenshotTests {}@Test- fun testForYouScreenTopicSelection() {+ fun forYouScreenTopicSelection() {composeTestRule.captureMultiDevice("ForYouScreenTopicSelection") {- NiaTheme {+ ForYouScreenTopicSelection()+ }+ }++ @Test+ fun forYouScreenTopicSelection_dark() {+ composeTestRule.captureForDevice(+ deviceName = "phone_dark",+ deviceSpec = DefaultTestDevices.PHONE.spec,+ screenshotName = "ForYouScreenTopicSelection",+ darkMode = true,+ ) {+ ForYouScreenTopicSelection()+ }+ }++ @Test+ fun forYouScreenPopulatedAndLoading() {+ composeTestRule.captureMultiDevice("ForYouScreenPopulatedAndLoading") {+ ForYouScreenPopulatedAndLoading()+ }+ }++ @Test+ fun forYouScreenPopulatedAndLoading_dark() {+ composeTestRule.captureForDevice(+ deviceName = "phone_dark",+ deviceSpec = DefaultTestDevices.PHONE.spec,+ screenshotName = "ForYouScreenPopulatedAndLoading",+ darkMode = true,+ ) {+ ForYouScreenPopulatedAndLoading()+ }+ }++ @Composable+ private fun ForYouScreenTopicSelection() {+ NiaTheme {+ NiaBackground {ForYouScreen(isSyncing = false,- onboardingUiState = OnboardingUiState.Shown(+ onboardingUiState = Shown(topics = userNewsResources.flatMap { news -> news.followableTopics }.distinctBy { it.topic.id },),- feedState = NewsFeedUiState.Success(+ feedState = Success(feed = userNewsResources,),onTopicCheckedChanged = { _, _ -> },@@ -126,24 +169,26 @@ class ForYouScreenScreenshotTests {}}- @Test- fun testForYouScreenPopulatedAndLoading() {- composeTestRule.captureMultiDevice("ForYouScreenPopulatedAndLoading") {- NiaTheme {- ForYouScreen(- isSyncing = true,- onboardingUiState = OnboardingUiState.Loading,- feedState = NewsFeedUiState.Success(- feed = userNewsResources,- ),- onTopicCheckedChanged = { _, _ -> },- saveFollowedTopics = {},- onNewsResourcesCheckedChanged = { _, _ -> },- onNewsResourceViewed = {},- onTopicClick = {},- deepLinkedUserNewsResource = null,- onDeepLinkOpened = {},- )+ @Composable+ private fun ForYouScreenPopulatedAndLoading() {+ NiaTheme {+ NiaBackground {+ NiaTheme {+ ForYouScreen(+ isSyncing = true,+ onboardingUiState = Loading,+ feedState = Success(+ feed = userNewsResources,+ ),+ onTopicCheckedChanged = { _, _ -> },+ saveFollowedTopics = {},+ onNewsResourcesCheckedChanged = { _, _ -> },+ onNewsResourceViewed = {},+ onTopicClick = {},+ deepLinkedUserNewsResource = null,+ onDeepLinkOpened = {},+ )+ }}}}diff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.pngindex aa2c12203..a66604bc6 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_foldable.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.pngindex de141fa02..579bc98a8 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.pngnew file mode 100644index 000000000..f013bb40aBinary files /dev/null and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.pngindex 3fe5194d8..75d6bc066 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png and b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_tablet.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_foldable.png b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_foldable.pngindex 95333c1d1..715889be5 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_foldable.png and b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_foldable.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone.pngindex ab86a2301..0bbe04955 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone.png and b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone_dark.png b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone_dark.pngnew file mode 100644index 000000000..1ba8943efBinary files /dev/null and b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_phone_dark.png differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_tablet.png b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_tablet.pngindex 292fc22f6..9a51764c5 100644Binary files a/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_tablet.png and b/feature/foryou/src/test/screenshots/ForYouScreenTopicSelection_tablet.png differ