From 1aa6375d26aee736cb550690845e96597ab13ee2 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Tue, 12 Mar 2024 14:13:05 -0700 Subject: [PATCH] Fix compilation errors in tests in the designsystem module --- core/designsystem/build.gradle.kts | 17 ++++++----- .../designsystem/BackgroundScreenshotTests.kt | 2 +- .../designsystem/ButtonScreenshotTests.kt | 2 +- .../designsystem/FilterChipScreenshotTests.kt | 2 +- .../designsystem/IconButtonScreenshotTests.kt | 2 +- .../LoadingWheelScreenshotTests.kt | 2 +- .../designsystem/NavigationScreenshotTests.kt | 2 +- .../core/designsystem/TabsScreenshotTests.kt | 2 +- .../core/designsystem/TagScreenshotTests.kt | 2 +- .../designsystem/TopAppBarScreenshotTests.kt | 6 ++-- ...ackground_dark_androidTheme_notDynamic.png | Bin .../Background_dark_defaultTheme_dynamic.png | Bin ...ackground_dark_defaultTheme_notDynamic.png | Bin ...ckground_light_androidTheme_notDynamic.png | Bin .../Background_light_defaultTheme_dynamic.png | Bin ...ckground_light_defaultTheme_notDynamic.png | Bin ...ackground_dark_androidTheme_notDynamic.png | Bin ...ntBackground_dark_defaultTheme_dynamic.png | Bin ...ackground_dark_defaultTheme_notDynamic.png | Bin ...ckground_light_androidTheme_notDynamic.png | Bin ...tBackground_light_defaultTheme_dynamic.png | Bin ...ckground_light_defaultTheme_notDynamic.png | Bin ...nLeadingIcon_dark_defaultTheme_dynamic.png | Bin ...adingIcon_dark_defaultTheme_notDynamic.png | Bin ...LeadingIcon_light_defaultTheme_dynamic.png | Bin ...dingIcon_light_defaultTheme_notDynamic.png | Bin .../Button_dark_androidTheme_notDynamic.png | Bin .../Button_dark_defaultTheme_dynamic.png | Bin .../Button_dark_defaultTheme_notDynamic.png | Bin .../Button_light_androidTheme_notDynamic.png | Bin .../Button_light_defaultTheme_dynamic.png | Bin .../Button_light_defaultTheme_notDynamic.png | Bin ...ineButton_dark_androidTheme_notDynamic.png | Bin ...utlineButton_dark_defaultTheme_dynamic.png | Bin ...ineButton_dark_defaultTheme_notDynamic.png | Bin ...neButton_light_androidTheme_notDynamic.png | Bin ...tlineButton_light_defaultTheme_dynamic.png | Bin ...neButton_light_defaultTheme_notDynamic.png | Bin ...pSelected_dark_androidTheme_notDynamic.png | Bin ...ChipSelected_dark_defaultTheme_dynamic.png | Bin ...pSelected_dark_defaultTheme_notDynamic.png | Bin ...Selected_light_androidTheme_notDynamic.png | Bin ...hipSelected_light_defaultTheme_dynamic.png | Bin ...Selected_light_defaultTheme_notDynamic.png | Bin ...ilterChip_dark_androidTheme_notDynamic.png | Bin .../FilterChip_dark_defaultTheme_dynamic.png | Bin ...ilterChip_dark_defaultTheme_notDynamic.png | Bin .../FilterChip/FilterChip_fontScale2.png | Bin ...lterChip_light_androidTheme_notDynamic.png | Bin .../FilterChip_light_defaultTheme_dynamic.png | Bin ...lterChip_light_defaultTheme_notDynamic.png | Bin ...Unchecked_dark_androidTheme_notDynamic.png | Bin ...tonUnchecked_dark_defaultTheme_dynamic.png | Bin ...Unchecked_dark_defaultTheme_notDynamic.png | Bin ...nchecked_light_androidTheme_notDynamic.png | Bin ...onUnchecked_light_defaultTheme_dynamic.png | Bin ...nchecked_light_defaultTheme_notDynamic.png | Bin ...conButton_dark_androidTheme_notDynamic.png | Bin .../IconButton_dark_defaultTheme_dynamic.png | Bin ...conButton_dark_defaultTheme_notDynamic.png | Bin ...onButton_light_androidTheme_notDynamic.png | Bin .../IconButton_light_defaultTheme_dynamic.png | Bin ...onButton_light_defaultTheme_notDynamic.png | Bin .../LoadingWheel_animation_1000.png | Bin .../LoadingWheel_animation_115.png | Bin .../LoadingWheel_animation_20.png | Bin .../LoadingWheel_animation_724.png | Bin ...dingWheel_dark_androidTheme_notDynamic.png | Bin ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin ...dingWheel_dark_defaultTheme_notDynamic.png | Bin ...ingWheel_light_androidTheme_notDynamic.png | Bin ...oadingWheel_light_defaultTheme_dynamic.png | Bin ...ingWheel_light_defaultTheme_notDynamic.png | Bin ...dingWheel_dark_androidTheme_notDynamic.png | Bin ...LoadingWheel_dark_defaultTheme_dynamic.png | Bin ...dingWheel_dark_defaultTheme_notDynamic.png | Bin ...ingWheel_light_androidTheme_notDynamic.png | Bin ...oadingWheel_light_defaultTheme_dynamic.png | Bin ...ingWheel_light_defaultTheme_notDynamic.png | Bin ...avigation_dark_androidTheme_notDynamic.png | Bin .../Navigation_dark_defaultTheme_dynamic.png | Bin ...avigation_dark_defaultTheme_notDynamic.png | Bin .../Navigation/Navigation_fontScale2.png | Bin ...vigation_light_androidTheme_notDynamic.png | Bin .../Navigation_light_defaultTheme_dynamic.png | Bin ...vigation_light_defaultTheme_notDynamic.png | Bin .../Tabs_dark_androidTheme_notDynamic.png | Bin .../Tabs/Tabs_dark_defaultTheme_dynamic.png | Bin .../Tabs_dark_defaultTheme_notDynamic.png | Bin .../screenshots/Tabs/Tabs_fontScale2.png | Bin .../Tabs_light_androidTheme_notDynamic.png | Bin .../Tabs/Tabs_light_defaultTheme_dynamic.png | Bin .../Tabs_light_defaultTheme_notDynamic.png | Bin .../Tag/Tag_dark_androidTheme_notDynamic.png | Bin .../Tag/Tag_dark_defaultTheme_dynamic.png | Bin .../Tag/Tag_dark_defaultTheme_notDynamic.png | Bin .../screenshots/Tag/Tag_fontScale2.png | Bin .../Tag/Tag_light_androidTheme_notDynamic.png | Bin .../Tag/Tag_light_defaultTheme_dynamic.png | Bin .../Tag/Tag_light_defaultTheme_notDynamic.png | Bin ...TopAppBar_dark_androidTheme_notDynamic.png | Bin .../TopAppBar_dark_defaultTheme_dynamic.png | Bin ...TopAppBar_dark_defaultTheme_notDynamic.png | Bin .../TopAppBar/TopAppBar_fontScale2.png | Bin ...opAppBar_light_androidTheme_notDynamic.png | Bin .../TopAppBar_light_defaultTheme_dynamic.png | Bin ...opAppBar_light_defaultTheme_notDynamic.png | Bin .../core/testing/util/MainDispatcherRule.kt | 0 .../core/testing/di/TestDispatcherModule.kt | 17 +++++------ .../core/testing/di/TestDispatchersModule.kt | 28 ++++-------------- .../TestSearchContentsRepository.kt | 5 +--- 111 files changed, 35 insertions(+), 54 deletions(-) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt (97%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt (98%) rename core/designsystem/src/{commonTest => androidUnitTest}/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt (95%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/Background_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/Button_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_fontScale2.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_animation_1000.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_animation_115.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_animation_20.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_animation_724.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_fontScale2.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_fontScale2.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_fontScale2.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_fontScale2.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png (100%) rename core/designsystem/src/{commonTest => androidUnitTest}/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png (100%) rename core/testing/src/{commonMain => androidMain}/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt (100%) diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 9dff86db8..c9a973ac7 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -33,8 +33,17 @@ kotlin { implementation(libs.compose.ui.tooling.preview) implementation(libs.androidx.activity.compose) } + androidInstrumentedTest.dependencies { + implementation(libs.androidx.compose.ui.test) + implementation(projects.core.testing) + } androidUnitTest.dependencies { implementation(libs.androidx.compose.ui.test) + implementation(libs.accompanist.testharness) + implementation(libs.robolectric) + implementation(libs.roborazzi) + implementation(libs.hilt.android.testing) + implementation(projects.core.screenshotTesting) implementation(projects.core.testing) } commonMain.dependencies { @@ -51,13 +60,7 @@ kotlin { } } } + dependencies { lintPublish(projects.lint) - - testImplementation(libs.androidx.compose.ui.test) - testImplementation(libs.accompanist.testharness) - testImplementation(libs.robolectric) - testImplementation(libs.roborazzi) - testImplementation(projects.core.screenshotTesting) - testImplementation(projects.core.testing) } diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt similarity index 97% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt index e8cfd9a96..d65a19dae 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/BackgroundScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt index 2f6ab5370..b4297f372 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/ButtonScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt index 2c9bc91ec..d838362c4 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/FilterChipScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt index 0104cfd47..5f12e44fd 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/IconButtonScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt index 9f80d04e5..57916092b 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/LoadingWheelScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt index e2e92b570..31ade1f88 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/NavigationScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt index 9190d5f35..f551770d3 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TabsScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt similarity index 98% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt index d9edfd6c6..9c73aff18 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TagScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt similarity index 95% rename from core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt rename to core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt index 6fac01562..a016f911b 100644 --- a/core/designsystem/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt +++ b/core/designsystem/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/TopAppBarScreenshotTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ import org.robolectric.annotation.LooperMode @GraphicsMode(GraphicsMode.Mode.NATIVE) @Config(application = HiltTestApplication::class, qualifiers = "480dpi") @LooperMode(LooperMode.Mode.PAUSED) -class TopAppBarScreenshotTests() { +class TopAppBarScreenshotTests { @get:Rule val composeTestRule = createAndroidComposeRule() @@ -80,7 +80,7 @@ class TopAppBarScreenshotTests() { @Composable private fun NiaTopAppBarExample() { NiaTopAppBar( - titleRes = android.R.string.untitled, + title = "Untitled", navigationIcon = NiaIcons.Search, navigationIconContentDescription = "Navigation icon", actionIcon = NiaIcons.MoreVert, diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_fontScale2.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_fontScale2.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_fontScale2.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_fontScale2.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_fontScale2.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png diff --git a/core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png similarity index 100% rename from core/designsystem/src/commonTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png rename to core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt b/core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt similarity index 100% rename from core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt rename to core/testing/src/androidMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt index 09c739243..40c1d45e7 100644 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt +++ b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt @@ -1,5 +1,5 @@ /* - * Copyright 2022 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,15 @@ package com.google.samples.apps.nowinandroid.core.testing.di -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.UnconfinedTestDispatcher -import javax.inject.Singleton +import me.tatarka.inject.annotations.Component +import me.tatarka.inject.annotations.Provides -@Module -@InstallIn(SingletonComponent::class) -internal object TestDispatcherModule { +@Component +internal abstract class TestDispatcherModule { + @OptIn(ExperimentalCoroutinesApi::class) @Provides - @Singleton fun providesTestDispatcher(): TestDispatcher = UnconfinedTestDispatcher() } diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt index a664d5538..167e71237 100644 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt +++ b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt @@ -1,5 +1,5 @@ /* - * Copyright 2022 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,29 +17,13 @@ package com.google.samples.apps.nowinandroid.core.testing.di import com.google.samples.apps.nowinandroid.core.di.DispatchersComponent -import com.google.samples.apps.nowinandroid.core.network.Dispatcher -import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.Default -import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO -import dagger.Module -import dagger.Provides -import dagger.hilt.components.SingletonComponent -import dagger.hilt.testing.TestInstallIn import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.test.TestDispatcher +import me.tatarka.inject.annotations.Component +import me.tatarka.inject.annotations.Provides -@Module -@TestInstallIn( - components = [SingletonComponent::class], - replaces = [DispatchersComponent::class], -) -internal object TestDispatchersModule { +@Component +internal abstract class TestDispatchersModule { @Provides - @Dispatcher(IO) - fun providesIODispatcher(testDispatcher: TestDispatcher): CoroutineDispatcher = testDispatcher - - @Provides - @Dispatcher(Default) - fun providesDefaultDispatcher( - testDispatcher: TestDispatcher, - ): CoroutineDispatcher = testDispatcher + fun providesDispatcher(testDispatcher: TestDispatcher): CoroutineDispatcher = testDispatcher } diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt index 5436cd10f..47d95556e 100644 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt +++ b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023 The Android Open Source Project + * Copyright 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.update -import org.jetbrains.annotations.TestOnly class TestSearchContentsRepository : SearchContentsRepository { @@ -47,10 +46,8 @@ class TestSearchContentsRepository : SearchContentsRepository { override fun getSearchContentsCount(): Flow = combine(cachedTopics, cachedNewsResources) { topics, news -> topics.size + news.size } - @TestOnly fun addTopics(topics: List) = cachedTopics.update { it + topics } - @TestOnly fun addNewsResources(newsResources: List) = cachedNewsResources.update { it + newsResources } }