Skip to content

Commit 6f4b188

Browse files
kikosokikoso
authored
chore: update screenshot framework (#821)
1 parent cd89214 commit 6f4b188

File tree

8 files changed

+39
-66
lines changed

8 files changed

+39
-66
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew build jacocoTestReport -x :maps-app:generateDebugScreenshotTestConfig -x :maps-app:testDebugScreenshotTest -x :maps-app:generateReleaseScreenshotTestConfig -x :maps-app:testReleaseScreenshotTest --stacktrace
4646

4747
- name: Run Screenshot Tests
48-
run: ./gradlew validateDebugScreenshotTest
48+
run: ./gradlew :maps-app:validateDebugScreenshotTest
4949

5050
- name: Upload build reports
5151
uses: actions/upload-artifact@v4

‎maps-app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dependencies {
8484
implementation(libs.material)
8585
implementation(libs.androidx.compose.material.icons.extended.android)
8686

87-
implementation(libs.screenshot.validation.api)
87+
screenshotTestImplementation(libs.screenshot.validation.api)
8888
debugImplementation(libs.androidx.compose.ui.tooling)
8989
debugImplementation(libs.leakcanary.android)
9090

‎maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import androidx.compose.ui.graphics.toArgb
5959
import androidx.compose.ui.platform.testTag
6060
import androidx.compose.ui.text.style.TextAlign
6161
import androidx.compose.ui.unit.dp
62-
import com.android.tools.screenshot.PreviewTest
6362
import com.google.android.gms.maps.CameraUpdateFactory
6463
import com.google.android.gms.maps.model.BitmapDescriptorFactory
6564
import com.google.android.gms.maps.model.CameraPosition
@@ -433,7 +432,6 @@ private fun DebugView(
433432
}
434433

435434

436-
@PreviewTest
437435
@Composable
438436
fun GoogleMapViewPreview() {
439437
MapsComposeSampleTheme {

‎maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.runtime.setValue
3939
import androidx.compose.ui.Alignment
4040
import androidx.compose.ui.Modifier
4141
import androidx.compose.ui.unit.dp
42-
import com.android.tools.screenshot.PreviewTest
4342
import com.google.android.gms.maps.model.CameraPosition
4443
import com.google.android.gms.maps.model.LatLng
4544
import com.google.maps.android.compose.theme.MapsComposeSampleTheme
@@ -131,26 +130,4 @@ class ScaleBarActivity : ComponentActivity() {
131130
}
132131
}
133132
}
134-
}
135-
136-
@PreviewTest
137-
@Composable
138-
fun PreviewScaleBar() {
139-
val cameraPositionState = remember {
140-
CameraPositionState(
141-
position = CameraPosition(
142-
LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
143-
12f,
144-
0f,
145-
0f
146-
)
147-
)
148-
}
149-
150-
MapsComposeSampleTheme {
151-
ScaleBar(
152-
modifier = Modifier.padding(end = 4.dp),
153-
cameraPositionState = cameraPositionState
154-
)
155-
}
156133
}

‎maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,48 @@ import com.google.maps.android.compose.widgets.DisappearingScaleBar
1414
import com.google.maps.android.compose.widgets.ScaleBar
1515

1616

17-
class ScaleBarTest() {
18-
@PreviewTest
19-
@Preview(showBackground = true)
20-
@Composable
21-
fun PreviewScaleBar() {
22-
val cameraPositionState = remember {
23-
CameraPositionState(
24-
position = CameraPosition(
25-
LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
26-
12f,
27-
0f,
28-
0f
29-
)
17+
@PreviewTest
18+
@Preview(showBackground = true)
19+
@Composable
20+
fun PreviewScaleBar() {
21+
val cameraPositionState = remember {
22+
CameraPositionState(
23+
position = CameraPosition(
24+
LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
25+
12f,
26+
0f,
27+
0f
3028
)
31-
}
29+
)
30+
}
3231

33-
MapsComposeSampleTheme {
34-
ScaleBar(
35-
modifier = Modifier.padding(end = 4.dp),
36-
cameraPositionState = cameraPositionState
37-
)
38-
}
32+
MapsComposeSampleTheme {
33+
ScaleBar(
34+
modifier = Modifier.padding(end = 4.dp),
35+
cameraPositionState = cameraPositionState
36+
)
3937
}
38+
}
4039

41-
@PreviewTest
42-
@Preview(showBackground = true)
43-
@Composable
44-
fun PreviewDisappearingScaleBar() {
45-
val cameraPositionState = remember {
46-
CameraPositionState(
47-
position = CameraPosition(
48-
LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
49-
12f,
50-
0f,
51-
0f
52-
)
40+
@PreviewTest
41+
@Preview(showBackground = true)
42+
@Composable
43+
fun PreviewDisappearingScaleBar() {
44+
val cameraPositionState = remember {
45+
CameraPositionState(
46+
position = CameraPosition(
47+
LatLng(48.137154, 11.576124), // Example coordinates: Munich, Germany
48+
12f,
49+
0f,
50+
0f
5351
)
54-
}
52+
)
53+
}
5554

56-
MapsComposeSampleTheme {
57-
DisappearingScaleBar(
58-
modifier = Modifier.padding(end = 4.dp),
59-
cameraPositionState = cameraPositionState
60-
)
61-
}
55+
MapsComposeSampleTheme {
56+
DisappearingScaleBar(
57+
modifier = Modifier.padding(end = 4.dp),
58+
cameraPositionState = cameraPositionState
59+
)
6260
}
6361
}

‎maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewDisappearingScaleBar_748aa731_0.png‎

-2.73 KB
Binary file not shown.

‎maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png‎

2.66 KB
Loading

maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTest/PreviewScaleBar_748aa731_0.png renamed to maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png

File renamed without changes.

0 commit comments

Comments
 (0)