Merge branch 'main' into replace-testharness

* main: (37 commits) Disable animations of instrumented tests (#1167) Bump gradle/wrapper-validation-action from 1 to 2 Remove unused release variable. Fixes #1231 Apply Composable Parameter Ordering Guidelines Remove kotlinx-coroutines-guava dependency from :sync:work Add explicit guava-android dependency for :sync:work Extract ScreenshotHelper to separate testing module Update AGP to 8.3.0 Remove Insert function - Insert is only used in test. - Upsert do same thing as Insert. 🤖 Updates baselines for Dependency Guard Bump the kotlin-ksp-compose group with 6 updates 🤖 Updates baselines for Dependency Guard Bump hilt from 2.50 to 2.51 Bump com.google.truth:truth from 1.1.5 to 1.4.2 Move java to kotlin folder. Remove disk usage testing Figuring out what is using 66Gb in the runner Dpm Improve converting to kotlin timezone Use trySend multiple times ... Change-Id: If3f564108d42675ba55ef242f0d06f04aff45c4a
android · Mar 6, 2024 · 6810e48 · 6810e48
2 parents 7737368 + ab90334
commit 6810e48
Show file tree

Hide file tree

Showing 52 changed files with 508 additions and 302 deletions.
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -37,7 +37,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Check build-logic
         run: ./gradlew check -p build-logic
@@ -178,7 +178,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Build projects before running emulator
         run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4   
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

diff --git a/README.md b/README.md
@@ -122,9 +122,9 @@ tests against _all_ build variants which is both unecessary and will result in f
 A screenshot test takes a screenshot of a screen or a UI component within the app, and compares it 
 with a previously recorded screenshot which is known to be rendered correctly. 
 
-For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt)
+For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt)
 to verify that the navigation is displayed correctly on different screen sizes 
-([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemoDebug/screenshots)). 
+([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemo/screenshots)). 
 
 Now In Android uses [Roborazzi](https://github.com/takahirom/roborazzi) to run screenshot tests
 of certain screens and UI components. When working with screenshot tests the following gradle tasks are useful:

diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
@@ -80,10 +80,10 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-lint-aar:2.50
-com.google.dagger:dagger:2.50
-com.google.dagger:hilt-android:2.50
-com.google.dagger:hilt-core:2.50
+com.google.dagger:dagger-lint-aar:2.51
+com.google.dagger:dagger:2.51
+com.google.dagger:hilt-android:2.51
+com.google.dagger:hilt-core:2.51
 com.google.guava:listenablefuture:1.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.6.0
@@ -93,10 +93,10 @@ io.coil-kt:coil-compose-base:2.5.0
 io.coil-kt:coil-compose:2.5.0
 io.coil-kt:coil:2.5.0
 javax.inject:javax.inject:1
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib:1.9.21
+org.jetbrains.kotlin:kotlin-stdlib:1.9.22
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -45,7 +45,7 @@ android {
         debug {
             applicationIdSuffix = NiaBuildType.DEBUG.applicationIdSuffix
         }
-        val release = getByName("release") {
+        release {
             isMinifyEnabled = true
             applicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
@@ -93,6 +93,7 @@ dependencies {
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.tracing.ktx)
     implementation(libs.androidx.lifecycle.runtimeCompose)
+    implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
@@ -112,10 +113,12 @@ dependencies {
 
     testDemoImplementation(libs.robolectric)
     testDemoImplementation(libs.roborazzi)
+    testDemoImplementation(projects.core.screenshotTesting)
 
     androidTestImplementation(projects.core.testing)
     androidTestImplementation(projects.core.dataTest)
     androidTestImplementation(projects.core.datastoreTest)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.androidx.compose.ui.test)
     androidTestImplementation(libs.hilt.android.testing)

diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@ -34,6 +34,7 @@ androidx.compose.material:material-ripple:1.6.1
 androidx.compose.runtime:runtime-android:1.6.1
 androidx.compose.runtime:runtime-saveable-android:1.6.1
 androidx.compose.runtime:runtime-saveable:1.6.1
+androidx.compose.runtime:runtime-tracing:1.0.0-beta01
 androidx.compose.runtime:runtime:1.6.1
 androidx.compose.ui:ui-android:1.6.1
 androidx.compose.ui:ui-geometry-android:1.6.1
@@ -109,6 +110,7 @@ androidx.sqlite:sqlite-framework:2.4.0
 androidx.sqlite:sqlite:2.4.0
 androidx.startup:startup-runtime:1.1.1
 androidx.tracing:tracing-ktx:1.3.0-alpha02
+androidx.tracing:tracing-perfetto:1.0.0
 androidx.tracing:tracing:1.3.0-alpha02
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0
@@ -137,10 +139,10 @@ com.google.android.gms:play-services-oss-licenses:17.0.1
 com.google.android.gms:play-services-stats:17.0.2
 com.google.android.gms:play-services-tasks:18.0.2
 com.google.code.findbugs:jsr305:3.0.2
-com.google.dagger:dagger-lint-aar:2.50
-com.google.dagger:dagger:2.50
-com.google.dagger:hilt-android:2.50
-com.google.dagger:hilt-core:2.50
+com.google.dagger:dagger-lint-aar:2.51
+com.google.dagger:dagger:2.51
+com.google.dagger:hilt-android:2.51
+com.google.dagger:hilt-core:2.51
 com.google.errorprone:error_prone_annotations:2.11.0
 com.google.firebase:firebase-abt:21.1.1
 com.google.firebase:firebase-analytics-ktx:21.4.0
@@ -188,10 +190,10 @@ io.github.aakira:napier-android:1.4.1
 io.github.aakira:napier:1.4.1
 javax.inject:javax.inject:1
 org.checkerframework:checker-qual:3.12.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib:1.9.21
+org.jetbrains.kotlin:kotlin-stdlib:1.9.22
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3

diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt
@@ -21,13 +21,16 @@ import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSiz
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.ui.test.DeviceConfigurationOverride
 import androidx.compose.ui.test.ForcedSize
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
@@ -82,6 +85,9 @@ class NavigationUiTest {
     @Inject
     lateinit var networkMonitor: NetworkMonitor
 
+    @Inject
+    lateinit var timeZoneMonitor: TimeZoneMonitor
+
     @Before
     fun setup() {
         hiltRule.inject()
@@ -94,13 +100,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 400.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -116,13 +116,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 400.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -138,13 +132,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 400.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -160,13 +148,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 500.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -182,13 +164,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 500.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -204,13 +180,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 500.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -226,13 +196,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 1000.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -248,13 +212,7 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 1000.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
@@ -270,18 +228,20 @@ class NavigationUiTest {
                 DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 1000.dp)),
             ) {
                 BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
+                    NiaApp(fakeAppState(maxWidth, maxHeight))
                 }
             }
         }
 
         composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
         composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
     }
+
+    @Composable
+    private fun fakeAppState(maxWidth: Dp, maxHeight: Dp) = rememberNiaAppState(
+        windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(maxWidth, maxHeight)),
+        networkMonitor = networkMonitor,
+        userNewsResourceRepository = userNewsResourceRepository,
+        timeZoneMonitor = timeZoneMonitor,
+    )
 }